From 39c9fec3ddd73c040558b0948aa57c62d3e9cab8 Mon Sep 17 00:00:00 2001 From: "S. Razi Alavizadeh" Date: Sun, 6 Apr 2014 17:38:36 +0430 Subject: [PATCH] [Windows] Fixed compile issues after aa248893 and 7f3d8ee7 --- src/lib/app/browserwindow.cpp | 12 ++++++------ src/main/main.pro | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index d4f560eae..e6243a064 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -430,7 +430,7 @@ void BrowserWindow::loadSettings() if (m_useTransparentBackground && !makeTransparent) { QtWin::extendFrameIntoClientArea(this, 0, 0, 0, 0); QtWin::enableBlurBehindWindow(this, false); - m_tabWidget->getTabBar()->enableBluredBackground(false); + m_tabWidget->tabBar()->enableBluredBackground(false); m_useTransparentBackground = false; } #endif @@ -459,13 +459,13 @@ void BrowserWindow::loadSettings() m_useTransparentBackground = true; if (!isFullScreen()) { - m_tabWidget->getTabBar()->enableBluredBackground(true); + m_tabWidget->tabBar()->enableBluredBackground(true); QtWin::extendFrameIntoClientArea(this); } // Install event filters menuBar()->installEventFilter(this); - m_tabWidget->getTabBar()->installEventFilter(this); + m_tabWidget->tabBar()->installEventFilter(this); m_navigationToolbar->installEventFilter(this); m_bookmarksToolbar->installEventFilter(this); statusBar()->installEventFilter(this); @@ -1077,7 +1077,7 @@ bool BrowserWindow::event(QEvent* event) m_navigationToolbar->buttonExitFullscreen()->setVisible(true); #ifdef Q_OS_WIN if (m_useTransparentBackground) { - m_tabWidget->getTabBar()->enableBluredBackground(false); + m_tabWidget->tabBar()->enableBluredBackground(false); QtWin::extendFrameIntoClientArea(this, 0, 0, 0 , 0); QtWin::enableBlurBehindWindow(this, false); } @@ -1095,7 +1095,7 @@ bool BrowserWindow::event(QEvent* event) m_navigationToolbar->buttonExitFullscreen()->setVisible(false); #ifdef Q_OS_WIN if (m_useTransparentBackground) { - m_tabWidget->getTabBar()->enableBluredBackground(true); + m_tabWidget->tabBar()->enableBluredBackground(true); applyBlurToMainWindow(true); } #endif @@ -1553,7 +1553,7 @@ void BrowserWindow::applyBlurToMainWindow(bool force) topMargin += menuBar()->isVisible() ? menuBar()->height() : 0; topMargin += m_navigationToolbar->isVisible() ? m_navigationToolbar->height() : 0; topMargin += m_bookmarksToolbar->isVisible() ? m_bookmarksToolbar->height() : 0; - topMargin += m_tabWidget->getTabBar()->height(); + topMargin += m_tabWidget->tabBar()->height(); SearchToolBar* search = searchToolBar(); if (search) { diff --git a/src/main/main.pro b/src/main/main.pro index 472fff491..20b73e14b 100644 --- a/src/main/main.pro +++ b/src/main/main.pro @@ -32,6 +32,5 @@ os2:RC_FILE = appicon_os2.rc win32:RC_FILE = appicon.rc include(../install.pri) -include(../lib/3rdparty/qtsingleapplication/qtsingleapplication.pri) unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN