diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-05-27 10:44:13 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-05-27 10:44:13 +1000 |
| commit | 2845d014ec873792897af313c4a86e833d4d2d9b (patch) | |
| tree | fe57e8e3b7665084c48b04d5c389412e57226b13 /tests/auto/declarative/qdeclarativesqldatabase | |
| parent | bfb347a463ceff05628abea6a105f6c83f100725 (diff) | |
Remove webkit dependency from test.
This wasn't a real dependency anyway, as all the code that used it
is commented out.
Diffstat (limited to 'tests/auto/declarative/qdeclarativesqldatabase')
| -rw-r--r-- | tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index 06654d9306..c48cdf7b55 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -1,6 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative -QT += sql script webkit +QT += sql script macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesqldatabase.cpp diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp index 9e2dd4a244..54c26a80be 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp +++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp @@ -45,10 +45,12 @@ #include <private/qdeclarativetext_p.h> #include <private/qdeclarativeengine_p.h> #include <QtCore/qcryptographichash.h> +/* #include <QtWebKit/qwebpage.h> #include <QtWebKit/qwebframe.h> #include <QtWebKit/qwebdatabase.h> #include <QtWebKit/qwebsecurityorigin.h> +*/ #include <QtSql/qsqldatabase.h> #include <QtCore/qdir.h> #include <QtCore/qfile.h> @@ -93,6 +95,7 @@ private: QDeclarativeEngine *engine; }; +/* class QWebPageWithJavaScriptConsoleMessages : public QWebPage { public: void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID) @@ -100,6 +103,7 @@ public: qWarning() << sourceID << ":" << lineNumber << ":" << message; } }; +*/ void removeRecursive(const QString& dirname) { |