From 32ea33253afbbdefd2680aa95ab5f57455272ae7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 30 Nov 2012 16:58:06 +0100 Subject: Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 (http://svn.webkit.org/repository/webkit/trunk@136242) Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split Extra fixes will be cherry-picked. Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681 Reviewed-by: Simon Hausmann --- Tools/MiniBrowser/qt/BrowserWindow.cpp | 6 +++--- Tools/MiniBrowser/qt/MiniBrowser.pro | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Tools/MiniBrowser') diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp index d9de51974..70750c6a7 100644 --- a/Tools/MiniBrowser/qt/BrowserWindow.cpp +++ b/Tools/MiniBrowser/qt/BrowserWindow.cpp @@ -39,8 +39,8 @@ BrowserWindow::BrowserWindow(WindowOptions* options) : m_windowOptions(options) { - setTitle("MiniBrowser"); - setFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); + setWindowTitle("MiniBrowser"); + setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); setResizeMode(QQuickView::SizeRootObjectToView); // This allows starting MiniBrowser from the build directory without previously defining QML_IMPORT_PATH. @@ -147,7 +147,7 @@ void BrowserWindow::onTitleChanged(QString title) { if (title.isEmpty()) title = QLatin1String("MiniBrowser"); - setTitle(title); + setWindowTitle(title); } void BrowserWindow::zoomIn() diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro index 0fbddbe13..3db1c7887 100644 --- a/Tools/MiniBrowser/qt/MiniBrowser.pro +++ b/Tools/MiniBrowser/qt/MiniBrowser.pro @@ -30,7 +30,7 @@ DESTDIR = $${ROOT_BUILD_DIR}/bin have?(FONTCONFIG): PKGCONFIG += fontconfig -QT += network gui-private quick quick-private webkitwidgets webkitwidgets-private +QT += network gui-private quick quick-private webkit webkit-private macx: QT += xml RESOURCES += MiniBrowser.qrc -- cgit v1.2.1