Title: [126428] trunk/Source/WebKit2
- Revision
- 126428
- Author
- [email protected]
- Date
- 2012-08-23 08:11:47 -0700 (Thu, 23 Aug 2012)
Log Message
[Qt][WK2] Helper functions used by the raw webview tests should not be guarded by HAVE_QTQUICK
Reviewed by Simon Hausmann.
This fixes the build if the QtQuick module is not present.
* UIProcess/API/qt/tests/util.cpp:
(messageHandler):
(suppressDebugOutput):
* UIProcess/API/qt/tests/util.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (126427 => 126428)
--- trunk/Source/WebKit2/ChangeLog 2012-08-23 15:09:34 UTC (rev 126427)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-23 15:11:47 UTC (rev 126428)
@@ -1,3 +1,16 @@
+2012-08-23 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Helper functions used by the raw webview tests should not be guarded by HAVE_QTQUICK
+
+ Reviewed by Simon Hausmann.
+
+ This fixes the build if the QtQuick module is not present.
+
+ * UIProcess/API/qt/tests/util.cpp:
+ (messageHandler):
+ (suppressDebugOutput):
+ * UIProcess/API/qt/tests/util.h:
+
2012-08-23 Carlos Garcia Campos <[email protected]>
REGRESSION(r126306): it broke the plugin process
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp (126427 => 126428)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp 2012-08-23 15:09:34 UTC (rev 126427)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp 2012-08-23 15:11:47 UTC (rev 126428)
@@ -57,6 +57,22 @@
return timeoutSpy.isEmpty();
}
+static void messageHandler(QtMsgType type, const char* message)
+{
+ if (type == QtCriticalMsg) {
+ fprintf(stderr, "%s\n", message);
+ return;
+ }
+ // Do nothing
+}
+
+void suppressDebugOutput()
+{
+ qInstallMsgHandler(messageHandler); \
+ if (qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT").isEmpty()) \
+ qputenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT", "1");
+}
+
#if defined(HAVE_QTQUICK) && HAVE_QTQUICK
class LoadSpy : public QEventLoop {
Q_OBJECT
@@ -110,23 +126,6 @@
return timeoutSpy.isEmpty();
}
-static void messageHandler(QtMsgType type, const char* message)
-{
- if (type == QtCriticalMsg) {
- fprintf(stderr, "%s\n", message);
- return;
- }
- // Do nothing
-}
-
-void suppressDebugOutput()
-{
- qInstallMsgHandler(messageHandler); \
- if (qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT").isEmpty()) \
- qputenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT", "1");
-}
-
-
LoadStartedCatcher::LoadStartedCatcher(QQuickWebView* webView)
: m_webView(webView)
{
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (126427 => 126428)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2012-08-23 15:09:34 UTC (rev 126427)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2012-08-23 15:11:47 UTC (rev 126428)
@@ -30,11 +30,12 @@
#endif
void addQtWebProcessToPath();
+bool waitForSignal(QObject*, const char* signal, int timeout = 10000);
+void suppressDebugOutput();
+
#if defined(HAVE_QTQUICK) && HAVE_QTQUICK
-bool waitForSignal(QObject*, const char* signal, int timeout = 10000);
bool waitForLoadSucceeded(QQuickWebView* webView, int timeout = 10000);
bool waitForLoadFailed(QQuickWebView* webView, int timeout = 10000);
-void suppressDebugOutput();
class LoadStartedCatcher : public QObject {
Q_OBJECT
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
