2011-05-27 Alexis Menard <alexis.menard@openbossa.org>
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2011 15:34:17 +0000 (15:34 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2011 15:34:17 +0000 (15:34 +0000)
        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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87514 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp

index 41a6ac0..97a0a04 100644 (file)
@@ -1,3 +1,15 @@
+2011-05-27  Alexis Menard  <alexis.menard@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.menard@openbossa.org>
 
         Unreviewed build fix for Qt and QuickTime backend.
index 5a0ff93..d095361 100644 (file)
@@ -387,9 +387,11 @@ void tst_QGraphicsWebView::setPalette()
     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 @@ void tst_QGraphicsWebView::setPalette()
     if (!active) {
         controlView.show();
         QTest::qWaitForWindowShown(&controlView);
+        QApplication::setActiveWindow(&controlView);
         activeView = &controlView;
         controlView.activateWindow();
     } else {
+        QApplication::setActiveWindow(&view2);
         view2.activateWindow();
         activeView = &view2;
     }