qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: Remove some vestigial references 

qtdeclarative hasn't relied on qtwebkit for a long time (since
fbfb27a44a &
56d34a653a as early as 2011!).

Change-Id: If02572617034bf2c3eecbf081b96b1ed0ad65b45
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Robin Burchell 2017-01-16 12:51:41 +01:00
parent 01f7a9dbe2
commit 2c826af7c3
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp
View File

@ -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())

6
tests/auto/quick/examples/tst_examples.cpp
View File

@ -88,12 +88,6 @@ tst_examples::tst_examples()
excludedDirs << "snippets/qml/qtbinding";
excludedDirs << "snippets/qml/imports";
#ifdef QT_NO_WEBKIT
excludedDirs << "qtquick/modelviews/webview";
excludedDirs << "demos/webbrowser";
excludedDirs << "doc/src/snippets/qml/webview";
#endif
#ifdef QT_NO_XMLPATTERNS
excludedDirs << "demos/twitter";
excludedDirs << "demos/flickr";