Title: [135857] trunk/Tools
- Revision
- 135857
- Author
- [email protected]
- Date
- 2012-11-27 06:11:16 -0800 (Tue, 27 Nov 2012)
Log Message
[Qt] Fix the build with new Qt5 hash
https://bugs.webkit.org/show_bug.cgi?id=103406
Reviewed by Csaba Osztrogonác.
Remove references to deprecated QApplication::GuiServer which
has been removed, and use QStyleFactory::create instead of
instantiating a QWindowsStyle directly since it is about to
become an internal class.
* DumpRenderTree/qt/DumpRenderTreeMain.cpp:
(main):
* QtTestBrowser/qttestbrowser.cpp:
(LauncherApplication::LauncherApplication):
* WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp:
(WTR::InjectedBundle::platformInitialize):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (135856 => 135857)
--- trunk/Tools/ChangeLog 2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/ChangeLog 2012-11-27 14:11:16 UTC (rev 135857)
@@ -1,3 +1,22 @@
+2012-11-27 Andras Becsi <[email protected]>
+
+ [Qt] Fix the build with new Qt5 hash
+ https://bugs.webkit.org/show_bug.cgi?id=103406
+
+ Reviewed by Csaba Osztrogonác.
+
+ Remove references to deprecated QApplication::GuiServer which
+ has been removed, and use QStyleFactory::create instead of
+ instantiating a QWindowsStyle directly since it is about to
+ become an internal class.
+
+ * DumpRenderTree/qt/DumpRenderTreeMain.cpp:
+ (main):
+ * QtTestBrowser/qttestbrowser.cpp:
+ (LauncherApplication::LauncherApplication):
+ * WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp:
+ (WTR::InjectedBundle::platformInitialize):
+
2012-11-27 Sadrul Habib Chowdhury <[email protected]>
[style] Add a style-check for enum-member names
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp (135856 => 135857)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp 2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp 2012-11-27 14:11:16 UTC (rev 135857)
@@ -35,11 +35,12 @@
#include <qdir.h>
#include <qfont.h>
#include <qstringlist.h>
+#include <qstylefactory.h>
#include <qtimer.h>
#include <qurl.h>
#include <qwebdatabase.h>
-#include <qwindowsstyle.h>
+
#include <wtf/AlwaysInline.h>
#include <wtf/ExportMacros.h>
@@ -116,7 +117,7 @@
WebKit::QtTestSupport::initializeTestFonts();
- QApplication::setStyle(new QWindowsStyle);
+ QApplication::setStyle(QStyleFactory::create(QLatin1String("windows")));
QApplication::setDesktopSettingsAware(false);
QApplication app(argc, argv);
Modified: trunk/Tools/QtTestBrowser/qttestbrowser.cpp (135856 => 135857)
--- trunk/Tools/QtTestBrowser/qttestbrowser.cpp 2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/QtTestBrowser/qttestbrowser.cpp 2012-11-27 14:11:16 UTC (rev 135857)
@@ -88,7 +88,7 @@
}
LauncherApplication::LauncherApplication(int& argc, char** argv)
- : QApplication(argc, argv, QApplication::GuiServer)
+ : QApplication(argc, argv)
, m_isRobotized(false)
, m_robotTimeoutSeconds(0)
, m_robotExtraTimeSeconds(0)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp (135856 => 135857)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp 2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp 2012-11-27 14:11:16 UTC (rev 135857)
@@ -28,7 +28,8 @@
#include "InjectedBundle.h"
#include <QApplication>
#include <QByteArray>
-#include <QWindowsStyle>
+#include <QStyle>
+#include <QStyleFactory>
#include <stdio.h>
#include <stdlib.h>
#include <wtf/AlwaysInline.h>
@@ -38,7 +39,7 @@
void InjectedBundle::platformInitialize(WKTypeRef)
{
- QWindowsStyle* styleForTests = new QWindowsStyle;
+ QStyle* styleForTests = QStyleFactory::create(QLatin1String("windows"));
QApplication::setStyle(styleForTests);
// Force Qt to use the style's standard palette, instead of platform default palette. This is needed
// because we are setting the style after QApplication is instantiated.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
