diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/UIProcess/API/qt/tests/util.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/tests/util.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/tests/util.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp index 2582848aa..cdd1f9961 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/util.cpp +++ b/Source/WebKit2/UIProcess/API/qt/tests/util.cpp @@ -18,11 +18,15 @@ */ #include "util.h" -#include "private/qquickwebview_p.h" -#include "private/qwebloadrequest_p.h" + #include <QtTest/QtTest> #include <stdio.h> +#if defined(HAVE_QTQUICK) && HAVE_QTQUICK +#include "private/qquickwebview_p.h" +#include "private/qwebloadrequest_p.h" +#endif + void addQtWebProcessToPath() { // Since tests won't find ./QtWebProcess, add it to PATH (at the end to prevent surprises). @@ -53,6 +57,7 @@ bool waitForSignal(QObject* obj, const char* signal, int timeout) return timeoutSpy.isEmpty(); } +#if defined(HAVE_QTQUICK) && HAVE_QTQUICK class LoadSpy : public QEventLoop { Q_OBJECT public: @@ -136,5 +141,6 @@ void LoadStartedCatcher::onLoadingChanged(QWebLoadRequest* loadRequest) QCOMPARE(m_webView->loading(), true); } } +#endif #include "util.moc" |