Title: [87514] trunk/Source/WebKit/qt
- Revision
- 87514
- Author
- alexis.men...@openbossa.org
- Date
- 2011-05-27 08:34:17 -0700 (Fri, 27 May 2011)
Log Message
2011-05-27 Alexis Menard <alexis.men...@openbossa.org>
Reviewed by Csaba Osztrogonác.
[Qt] Fix tst_QGraphicsWebView::setPalette(inactiveBG) autotest
https://bugs.webkit.org/show_bug.cgi?id=61044
Make sure to set the active window on the application too.
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::setPalette):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (87513 => 87514)
--- trunk/Source/WebKit/qt/ChangeLog 2011-05-27 15:19:03 UTC (rev 87513)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-05-27 15:34:17 UTC (rev 87514)
@@ -1,3 +1,15 @@
+2011-05-27 Alexis Menard <alexis.men...@openbossa.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Fix tst_QGraphicsWebView::setPalette(inactiveBG) autotest
+ https://bugs.webkit.org/show_bug.cgi?id=61044
+
+ Make sure to set the active window on the application too.
+
+ * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+ (tst_QGraphicsWebView::setPalette):
+
2011-05-26 Alexis Menard <alexis.men...@openbossa.org>
Unreviewed build fix for Qt and QuickTime backend.
Modified: trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp (87513 => 87514)
--- trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp 2011-05-27 15:19:03 UTC (rev 87513)
+++ trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp 2011-05-27 15:34:17 UTC (rev 87514)
@@ -387,9 +387,11 @@
if (!active) {
controlView.show();
QTest::qWaitForWindowShown(&controlView);
+ QApplication::setActiveWindow(&controlView);
activeView = &controlView;
controlView.activateWindow();
} else {
+ QApplication::setActiveWindow(&view1);
view1.activateWindow();
activeView = &view1;
}
@@ -440,9 +442,11 @@
if (!active) {
controlView.show();
QTest::qWaitForWindowShown(&controlView);
+ QApplication::setActiveWindow(&controlView);
activeView = &controlView;
controlView.activateWindow();
} else {
+ QApplication::setActiveWindow(&view2);
view2.activateWindow();
activeView = &view2;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
