summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-15 04:01:30 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-15 04:01:30 (GMT)
commit3b0a9dbfa3683bfb6bdc484ed225267ca56bfa9b (patch)
tree9b436fa1ee3e03e550c68dfbf002b695faa39470
parent277f133520b1c62d939223b856cc2291ce8fa5f0 (diff)
downloadQt-3b0a9dbfa3683bfb6bdc484ed225267ca56bfa9b.zip
Qt-3b0a9dbfa3683bfb6bdc484ed225267ca56bfa9b.tar.gz
Qt-3b0a9dbfa3683bfb6bdc484ed225267ca56bfa9b.tar.bz2
Remove unnecessary webkit dependency
-rw-r--r--tests/auto/declarative/xmlhttprequest/tst_xmlhttprequest.cpp10
-rw-r--r--tests/auto/declarative/xmlhttprequest/xmlhttprequest.pro2
2 files changed, 1 insertions, 11 deletions
diff --git a/tests/auto/declarative/xmlhttprequest/tst_xmlhttprequest.cpp b/tests/auto/declarative/xmlhttprequest/tst_xmlhttprequest.cpp
index 6e0d582..d3201e2 100644
--- a/tests/auto/declarative/xmlhttprequest/tst_xmlhttprequest.cpp
+++ b/tests/auto/declarative/xmlhttprequest/tst_xmlhttprequest.cpp
@@ -43,8 +43,6 @@
#include <QmlEngine>
#include <QmlComponent>
#include <QDebug>
-#include <QWebPage>
-#include <QWebFrame>
#include <QNetworkCookieJar>
#include "testhttpserver.h"
@@ -118,14 +116,6 @@ private:
QmlEngine engine;
};
-class QWebPageWithJavaScriptConsoleMessages : public QWebPage {
-public:
- void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
- {
- qWarning() << sourceID << ":" << lineNumber << ":" << message;
- }
-};
-
inline QUrl TEST_FILE(const QString &filename)
{
return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
diff --git a/tests/auto/declarative/xmlhttprequest/xmlhttprequest.pro b/tests/auto/declarative/xmlhttprequest/xmlhttprequest.pro
index 6af4e39..1da28e5 100644
--- a/tests/auto/declarative/xmlhttprequest/xmlhttprequest.pro
+++ b/tests/auto/declarative/xmlhttprequest/xmlhttprequest.pro
@@ -1,5 +1,5 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative webkit network
+contains(QT_CONFIG,declarative): QT += declarative network
macx:CONFIG -= app_bundle
INCLUDEPATH += ../shared/