Title: [106919] trunk/Tools
Revision
106919
Author
[email protected]
Date
2012-02-07 03:19:23 -0800 (Tue, 07 Feb 2012)

Log Message

[Qt] Prevent early test termination with newer Qt 5
https://bugs.webkit.org/show_bug.cgi?id=77945

Patch by Simon Hausmann <[email protected]> on 2012-02-07
Reviewed by Csaba Osztrogonác.

QTBUG-24120 tracks a regression in Qt that would make layout tests
terminate early. This patch works around it in a Qt 4 + 5 safe manner
by disabling the quitOnLastWindowClosed feature, which we don't want/need
for DRT anyway.

* DumpRenderTree/qt/main.cpp:
(main): Don't quit on last window closed.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (106918 => 106919)


--- trunk/Tools/ChangeLog	2012-02-07 11:19:19 UTC (rev 106918)
+++ trunk/Tools/ChangeLog	2012-02-07 11:19:23 UTC (rev 106919)
@@ -1,3 +1,18 @@
+2012-02-07  Simon Hausmann  <[email protected]>
+
+        [Qt] Prevent early test termination with newer Qt 5
+        https://bugs.webkit.org/show_bug.cgi?id=77945
+
+        Reviewed by Csaba Osztrogonác.
+
+        QTBUG-24120 tracks a regression in Qt that would make layout tests
+        terminate early. This patch works around it in a Qt 4 + 5 safe manner
+        by disabling the quitOnLastWindowClosed feature, which we don't want/need
+        for DRT anyway.
+
+        * DumpRenderTree/qt/main.cpp:
+        (main): Don't quit on last window closed.
+
 2012-02-06  Martin Robinson  <[email protected]>
 
         Fix some miscellaneous 'make dist' error for WebKitGTK+.

Modified: trunk/Tools/DumpRenderTree/qt/main.cpp (106918 => 106919)


--- trunk/Tools/DumpRenderTree/qt/main.cpp	2012-02-07 11:19:19 UTC (rev 106918)
+++ trunk/Tools/DumpRenderTree/qt/main.cpp	2012-02-07 11:19:23 UTC (rev 106919)
@@ -149,6 +149,7 @@
     QApplication::setStyle(new QWindowsStyle);
 
     QApplication app(argc, argv);
+    app.setQuitOnLastWindowClosed(false);
 
 #if QT_VERSION <= QT_VERSION_CHECK(5, 0, 0) // FIXME: need a way to port this to Qt5.
 #ifdef Q_WS_X11
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to