Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea

1 files changed, 0 insertions, 42 deletions

diff --git a/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp b/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp
index e16bfb08a2..3b982d1ab7 100644
--- a/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp
+++ b/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp
@@ -31,12 +31,6 @@
 #include <QtQuick/private/qquicktext_p.h>
 #include <private/qqmlengine_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>
@@ -150,42 +144,6 @@ void tst_qqmlsqldatabase::testQml_data()
     // test - in which case increment total_databases_created_by_tests above.
 }
 
-/*
-class QWebPageWithJavaScriptConsoleMessages : public QWebPage {
-public:
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
-    {
-        qWarning() << sourceID << ":" << lineNumber << ":" << message;
-    }
-};
-
-void tst_qqmlsqldatabase::validateAgainstWebkit()
-{
-    // Validates tests against WebKit (HTML5) support.
-    //
-    QFETCH(QString, jsfile);
-    QFETCH(QString, result);
-    QFETCH(int, databases);
-
-    QFile f(jsfile);
-    QVERIFY(f.open(QIODevice::ReadOnly));
-    QString js=f.readAll();
-
-    QWebPageWithJavaScriptConsoleMessages webpage;
-    webpage.settings()->setOfflineStoragePath(dbDir());
-    webpage.settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
-
-    QEXPECT_FAIL("","WebKit doesn't support openDatabaseSync yet", Continue);
-    QCOMPARE(webpage.mainFrame()->evaluateJavaScript(js).toString(),result);
-
-    QTest::qWait(100); // WebKit crashes if you quit it too fast
-
-    QWebSecurityOrigin origin = webpage.mainFrame()->securityOrigin();
-    QList<QWebDatabase> dbs = origin.databases();
-    QCOMPARE(dbs.count(), databases);
-}
-*/
-
 void tst_qqmlsqldatabase::testQml()
 {
     if (engine->offlineStoragePath().isEmpty())