From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 27 May 2011 00:44:13 +0000 (+1000)
Subject: Remove webkit dependency from test.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=2845d014ec873792897af313c4a86e833d4d2d9b;p=konrad%2Fqtdeclarative.git

Remove webkit dependency from test.

This wasn't a real dependency anyway, as all the code that used it
is commented out.
---

diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
index 06654d9..c48cdf7 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 9e2dd4a..54c26a8 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)
 {