[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c5e0f414df60fa7d1a53096d72f630762cdc262a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 7 15:31:42 2009 +0000

    2009-12-07  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Improve the autotests of QtWebkit
            https://bugs.webkit.org/show_bug.cgi?id=32216
    
            Remove the calls to qWait() of the autotest of QWebView
    
            * tests/qwebview/tst_qwebview.cpp:
            (tst_QWebView::reusePage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index c7f52ea..2c2722b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -5,6 +5,18 @@
         [Qt] Improve the autotests of QtWebkit
         https://bugs.webkit.org/show_bug.cgi?id=32216
 
+        Remove the calls to qWait() of the autotest of QWebView
+
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::reusePage):
+
+2009-12-07  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Improve the autotests of QtWebkit
+        https://bugs.webkit.org/show_bug.cgi?id=32216
+
         Refactor tst_qwebframe to remove qWait() and use
         the function waitForSignal() from util.h
 
diff --git a/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/WebKit/qt/tests/qwebview/tst_qwebview.cpp
index 27daf38..bd2f185 100644
--- a/WebKit/qt/tests/qwebview/tst_qwebview.cpp
+++ b/WebKit/qt/tests/qwebview/tst_qwebview.cpp
@@ -132,18 +132,18 @@ void tst_QWebView::reusePage()
     mainFrame->setHtml(html, QUrl::fromLocalFile(QDir::currentPath()));
     if (html.contains("</embed>")) {
         // some reasonable time for the PluginStream to feed test.swf to flash and start painting
-        QTest::qWait(2000);
+        waitForSignal(view1, SIGNAL(loadFinished(bool)), 2000);
     }
 
     view1->show();
-    QTest::qWait(2000);
+    QTest::qWaitForWindowShown(view1);
     delete view1;
     QVERIFY(page != 0); // deleting view must not have deleted the page, since it's not a child of view
 
     QWebView *view2 = new QWebView;
     view2->setPage(page);
     view2->show(); // in Windowless mode, you should still be able to see the plugin here
-    QTest::qWait(2000);
+    QTest::qWaitForWindowShown(view2);
     delete view2;
 
     delete page; // must not crash

-- 
WebKit Debian packaging