From fb2629898bbe101cb87a47466d689ca91a22f83d Mon Sep 17 00:00:00 2001 From: nowrep Date: Mon, 10 Mar 2014 09:38:16 +0100 Subject: [PATCH] [TabBar] Don't draw base. Should help with Qt5 Fusion style Also small changes in MainApplication --- src/lib/app/mainapplication.cpp | 4 +++- src/lib/webview/tabbar.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 688807741..d6386cb36 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -270,6 +270,9 @@ MainApplication::~MainApplication() { // Delete all classes that are saving data in destructor delete m_bookmarks; + delete m_cookieJar; + + IconProvider::instance()->saveIconsToDatabase(); } bool MainApplication::isClosing() const @@ -729,7 +732,6 @@ void MainApplication::saveSettings() qzSettings->saveSettings(); AdBlockManager::instance()->save(); - IconProvider::instance()->saveIconsToDatabase(); QFile::remove(DataPaths::currentProfilePath() + QLatin1String("/WebpageIcons.db")); Settings::syncSettings(); } diff --git a/src/lib/webview/tabbar.cpp b/src/lib/webview/tabbar.cpp index 3b1bc0d5a..4022444dc 100644 --- a/src/lib/webview/tabbar.cpp +++ b/src/lib/webview/tabbar.cpp @@ -55,13 +55,13 @@ TabBar::TabBar(BrowserWindow* window, TabWidget* tabWidget) setObjectName("tabbar"); setContextMenuPolicy(Qt::CustomContextMenu); setElideMode(Qt::ElideRight); - setDocumentMode(true); setFocusPolicy(Qt::NoFocus); setTabsClosable(false); setMouseTracking(true); - setMovable(true); - + setDocumentMode(true); setAcceptDrops(true); + setDrawBase(false); + setMovable(true); connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int))); connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));