Changeset 109555 in webkit

Timestamp:

Mar 2, 2012 4:45:05 AM (12 years ago)

Author:

Simon Hausmann

Message:

[Qt] Fix tests run with WTR not using QStyle theme
​https://bugs.webkit.org/show_bug.cgi?id=80147

Reviewed by Csaba Osztrogonác.

Source/WebKit2:

Use an environment variable (set by WTR) to select the QStyle theme.
This is a temporary kludge until we rebase the layout tests to use the
QStyle independent "mobile" theme. This also temporarily breaks the
force_static_libs_as_shared build.

• Target.pri:
• WebProcess/qt/WebProcessMainQt.cpp:

(WebKit::WebProcessMainQt):

Tools:

• WebKitTestRunner/qt/main.cpp:

(main): Set environment variable for web process to use QStyle theme.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Target.pri (modified) (1 diff)
• Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/qt/main.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-02  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix tests run with WTR not using QStyle theme
+        https://bugs.webkit.org/show_bug.cgi?id=80147
+
+        Reviewed by Csaba Osztrogonác.
+
+        Use an environment variable (set by WTR) to select the QStyle theme.
+        This is a temporary kludge until we rebase the layout tests to use the
+        QStyle independent "mobile" theme. This also temporarily breaks the
+        force_static_libs_as_shared build.
+
+        * Target.pri:
+        * WebProcess/qt/WebProcessMainQt.cpp:
+        (WebKit::WebProcessMainQt):
+
 2012-03-02  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebKit2/Target.pri

@@ -726 +726 @@
     WebProcess/qt/WebProcessQt.cpp
 
+INCLUDEPATH += ../WebKit/qt/WebCoreSupport
 
 mac: {

trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp

@@ -44 +44 @@
 #endif
 
+#include "RenderThemeQStyle.h"
+#include "ScrollbarThemeQStyle.h"
+
 #ifndef NDEBUG
 #if !OS(WINDOWS)
@@ -204 +207 @@
     WebGraphicsLayer::initFactory();
 #endif
+    if (!qgetenv("QT_WEBKIT_USE_QSTYLE_THEME").isEmpty())
+        RenderThemeQt::setCustomTheme(RenderThemeQStyle::create, new ScrollbarThemeQStyle);
 
     WebKit::WebProcess::shared().initialize(identifier, RunLoop::main());

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-02  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix tests run with WTR not using QStyle theme
+        https://bugs.webkit.org/show_bug.cgi?id=80147
+
+        Reviewed by Csaba Osztrogonác.
+
+        * WebKitTestRunner/qt/main.cpp:
+        (main): Set environment variable for web process to use QStyle theme.
+
 2012-03-02  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/WebKitTestRunner/qt/main.cpp

@@ -93 +93 @@
     }
 
+    qputenv("QT_WEBKIT_USE_QSTYLE_THEME", "1");
+
     QQuickWebViewExperimental::setFlickableViewportEnabled(false);
     QApplication app(argc, argv);