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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit e08cc510e8c87f58fc8fb145b841c419f7525eea
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 15:54:20 2010 +0000

    [Qt] Symbian build fixes.
    
    Reviewed by Tor Arne Vestbø.
    
    * tests/qwebpage/tst_qwebpage.cpp: Include util.h
    * tests/tests.pri: Don't define TESTS_SOURCE_DIR, it doesn't work.
    * tests/util.h: Define TESTS_SOURCE_DIR here, just like it's done in Qt.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53267 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 215ddfe..b74b34b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,15 @@
 2010-01-14  Simon Hausmann  <simon.hausmann at nokia.com>
 
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Symbian build fixes.
+
+        * tests/qwebpage/tst_qwebpage.cpp: Include util.h
+        * tests/tests.pri: Don't define TESTS_SOURCE_DIR, it doesn't work.
+        * tests/util.h: Define TESTS_SOURCE_DIR here, just like it's done in Qt.
+
+2010-01-14  Simon Hausmann  <simon.hausmann at nokia.com>
+
         Reviewed by Kenneth Rohde Christiansen.
 
         [Qt] Update Symbian .def symbol export files after private API additions.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index e4c0ed6..6f60697 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -39,47 +39,7 @@
 #include <qwebdatabase.h>
 #include <QPushButton>
 #include <QDir>
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_COMPARE(__expr, __expected) \
-    do { \
-        const int __step = 50; \
-        const int __timeout = 5000; \
-        if ((__expr) != (__expected)) { \
-            QTest::qWait(0); \
-        } \
-        for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
-            QTest::qWait(__step); \
-        } \
-        QCOMPARE(__expr, __expected); \
-    } while(0)
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
-// Task 160192
-/**
- * Starts an event loop that runs until the given signal is received.
- Optionally the event loop
- * can return earlier on a timeout.
- *
- * \return \p true if the requested signal was received
- *         \p false on timeout
- */
-static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000)
-{
-    QEventLoop loop;
-    QObject::connect(obj, signal, &loop, SLOT(quit()));
-    QTimer timer;
-    QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
-    if (timeout > 0) {
-        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-        timer.setSingleShot(true);
-        timer.start(timeout);
-    }
-    loop.exec();
-    return timeoutSpy.isEmpty();
-}
+#include "../util.h"
 
 class EventSpy : public QObject, public QList<QEvent::Type>
 {
diff --git a/WebKit/qt/tests/tests.pri b/WebKit/qt/tests/tests.pri
index e71c6dc..c3d7755 100644
--- a/WebKit/qt/tests/tests.pri
+++ b/WebKit/qt/tests/tests.pri
@@ -16,8 +16,5 @@ symbian {
 }
 
 # This define is used by some tests to look up resources in the source tree
-!symbian {
-    DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
-} else {
-    DEFINES += TESTS_SOURCE_DIR=\\\"\\\"
-}
\ No newline at end of file
+!symbian: DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
+
diff --git a/WebKit/qt/tests/util.h b/WebKit/qt/tests/util.h
index 15af262..c61bc6b 100644
--- a/WebKit/qt/tests/util.h
+++ b/WebKit/qt/tests/util.h
@@ -22,6 +22,10 @@
 #include <QSignalSpy>
 #include <QTimer>
 
+#if !defined(TESTS_SOURCE_DIR)
+#define TESTS_SOURCE_DIR ""
+#endif
+
 /**
  * Starts an event loop that runs until the given signal is received.
  * Optionally the event loop

-- 
WebKit Debian packaging