Title: [98090] trunk/Source
- Revision
- 98090
- Author
- o...@webkit.org
- Date
- 2011-10-21 02:08:48 -0700 (Fri, 21 Oct 2011)
Log Message
[Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
Reviewed by Simon Hausmann.
Source/WebKit/qt:
* tests/util.h:
Source/WebKit2:
* UIProcess/API/qt/tests/util.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98089 => 98090)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 09:08:48 UTC (rev 98090)
@@ -1,3 +1,11 @@
+2011-10-21 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
+
+ Reviewed by Simon Hausmann.
+
+ * tests/util.h:
+
2011-10-21 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r98085.
Modified: trunk/Source/WebKit/qt/tests/util.h (98089 => 98090)
--- trunk/Source/WebKit/qt/tests/util.h 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit/qt/tests/util.h 2011-10-21 09:08:48 UTC (rev 98090)
@@ -49,6 +49,7 @@
return timeoutSpy.isEmpty();
}
+#if QT_VERSION <= QT_VERSION_CHECK(5, 0, 0)
// Will try to wait for the condition while allowing event processing
#define QTRY_VERIFY(__expr) \
do { \
@@ -76,3 +77,4 @@
} \
QCOMPARE(__expr, __expected); \
} while(0)
+#endif
Modified: trunk/Source/WebKit2/ChangeLog (98089 => 98090)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 09:08:48 UTC (rev 98090)
@@ -1,3 +1,11 @@
+2011-10-21 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt][WK2] Buildfix for newer Qt5. Remove duplicated defines.
+
+ Reviewed by Simon Hausmann.
+
+ * UIProcess/API/qt/tests/util.h:
+
2011-10-21 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Fix WebKit2 GTK+ build after r98081.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (98089 => 98090)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 09:00:56 UTC (rev 98089)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 09:08:48 UTC (rev 98090)
@@ -28,31 +28,3 @@
void addQtWebProcessToPath();
bool waitForSignal(QObject*, const char* signal, int timeout = 10000);
-
-// Will try to wait for the condition while allowing event processing
-#define QTRY_VERIFY(__expr) \
- do { \
- const int __step = 50; \
- const int __timeout = 5000; \
- if (!(__expr)) { \
- QTest::qWait(0); \
- } \
- for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
- QTest::qWait(__step); \
- } \
- QVERIFY(__expr); \
- } while(0)
-
-// 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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
