2 files changed, 19 insertions, 19 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp
index 6c91de717..4525e882b 100644
--- a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp
@@ -57,6 +57,22 @@ bool waitForSignal(QObject* obj, const char* signal, int timeout)
     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 @@ bool waitForLoadFailed(QQuickWebView* webView, int timeout)
     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)
 {
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/util.h b/Source/WebKit2/UIProcess/API/qt/tests/util.h
index ebb162cc4..0c14a1ff4 100644
--- a/Source/WebKit2/UIProcess/API/qt/tests/util.h
+++ b/Source/WebKit2/UIProcess/API/qt/tests/util.h
@@ -30,11 +30,12 @@ class QWebLoadRequest;
 #endif
 
 void addQtWebProcessToPath();
-#if defined(HAVE_QTQUICK) && HAVE_QTQUICK
 bool waitForSignal(QObject*, const char* signal, int timeout = 10000);
+void suppressDebugOutput();
+
+#if defined(HAVE_QTQUICK) && HAVE_QTQUICK
 bool waitForLoadSucceeded(QQuickWebView* webView, int timeout = 10000);
 bool waitForLoadFailed(QQuickWebView* webView, int timeout = 10000);
-void suppressDebugOutput();
 
 class LoadStartedCatcher : public QObject {
     Q_OBJECT