diff options
author | Robin Burchell <robin.burchell@crimson.no> | 2017-01-16 12:51:41 +0100 |
---|---|---|
committer | Robin Burchell <robin.burchell@crimson.no> | 2017-01-16 15:13:54 +0000 |
commit | 2c826af7c363e91656eb977fadb8afaf35f48290 (patch) | |
tree | 185eee6ee868cd9b260c605cb0ac339af70c4a58 /tests/auto/qml | |
parent | 01f7a9dbe2e41434db34841f7d0c812e7a492128 (diff) |
tests: Remove some vestigial references
qtdeclarative hasn't relied on qtwebkit for a long time (since
fbfb27a44a824fe479b526cbc6ccd4696d674c83 &
56d34a653a7ec4265835a7cb9b6352696f802e31 as early as 2011!).
Change-Id: If02572617034bf2c3eecbf081b96b1ed0ad65b45
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml')
-rw-r--r-- | tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp | 42 |
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()) |