diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-05-30 06:37:23 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-05 00:23:00 +0200 |
| commit | e3e23087e11d51112e8ce2c46e92927ce1309d2d (patch) | |
| tree | cc9f6bbb7e05b971444328c16990a68a7822b853 /tests/auto/quick/qmltests | |
| parent | a81880e62c388c8840417a6cec1c67f43d4b5fd9 (diff) | |
Fix typos and warnings in the Quick tests
- Add valid size to tst_faviconLoad.qml
- Add missing files to qmltests.pro
- Rename test cases and files from WebView to WebEngineView
Change-Id: I40163117a11672b18230046a1604624bc4620dba
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tests/auto/quick/qmltests')
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_favIconLoad.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_navigationHistory.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_favIconLoad.qml b/tests/auto/quick/qmltests/data/tst_favIconLoad.qml index 38276f950..9df8bbb65 100644 --- a/tests/auto/quick/qmltests/data/tst_favIconLoad.qml +++ b/tests/auto/quick/qmltests/data/tst_favIconLoad.qml @@ -45,6 +45,8 @@ import QtWebEngine 0.9 TestWebEngineView { id: webEngineView + width: 200 + height: 400 SignalSpy { id: spy diff --git a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml index 17472d2f1..8162bab5e 100644 --- a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml +++ b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml @@ -74,7 +74,7 @@ TestWebEngineView { } TestCase { - name: "WebViewNavigationHistory" + name: "WebEngineViewNavigationHistory" function test_navigationHistory() { compare(webEngineView.loadProgress, 0) diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index b2661552d..e6a68b950 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -11,10 +11,12 @@ OTHER_FILES += \ $$PWD/data/favicon.html \ $$PWD/data/favicon.png \ $$PWD/data/favicon2.html \ + $$PWD/data/javascript.html \ $$PWD/data/link.html \ $$PWD/data/redirect.html \ $$PWD/data/small-favicon.png \ $$PWD/data/test1.html \ + $$PWD/data/test2.html \ $$PWD/data/test3.html \ $$PWD/data/tst_desktopBehaviorLoadHtml.qml \ $$PWD/data/tst_favIconLoad.qml \ @@ -24,6 +26,7 @@ OTHER_FILES += \ $$PWD/data/tst_loadProgress.qml \ $$PWD/data/tst_loadProgressSignal.qml \ $$PWD/data/tst_loadUrl.qml \ + $$PWD/data/tst_navigationHistory.qml \ $$PWD/data/tst_properties.qml \ $$PWD/data/tst_runJavaScript.qml \ $$PWD/data/tst_titleChanged.qml |