diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-02 17:30:07 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-02 17:30:27 +0100 |
| commit | d058d6c9df1ff866e4259ca2989ad144bb01a1e0 (patch) | |
| tree | d91f8c314c20781080819d100df6a9855b30fbfd /tests/auto/quick | |
| parent | 0c6312dfba960365771c64b937579a40e02ea5f7 (diff) | |
| parent | 3f1805f8569337a21b72324d5edad329d5dfe872 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 4 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwebengineview/BLACKLIST | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 4d4268324..60c11addc 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -32,8 +32,8 @@ OTHER_FILES += \ $$PWD/data/prompt.html \ $$PWD/data/multifileupload.html \ $$PWD/data/redirect.html \ + $$PWD/data/script-with-metadata.js \ $$PWD/data/singlefileupload.html \ - $$PWD/data/small-favicon.png \ $$PWD/data/test1.html \ $$PWD/data/test2.html \ $$PWD/data/test3.html \ @@ -41,6 +41,7 @@ OTHER_FILES += \ $$PWD/data/keyboardModifierMapping.html \ $$PWD/data/keyboardEvents.html \ $$PWD/data/titleupdate.js \ + $$PWD/data/tst_activeFocusOnPress.qml \ $$PWD/data/tst_desktopBehaviorLoadHtml.qml \ $$PWD/data/tst_download.qml \ $$PWD/data/tst_favicon.qml \ @@ -72,6 +73,7 @@ OTHER_FILES += \ $$PWD/data/tst_settings.qml \ $$PWD/data/tst_keyboardModifierMapping.qml \ $$PWD/data/tst_keyboardEvents.qml \ + $$PWD/data/webchannel-test.html \ $$PWD/data/icons/favicon.png \ $$PWD/data/icons/gray128.png \ $$PWD/data/icons/gray16.png \ diff --git a/tests/auto/quick/qquickwebengineview/BLACKLIST b/tests/auto/quick/qquickwebengineview/BLACKLIST index 2cde59454..6cfd71635 100644 --- a/tests/auto/quick/qquickwebengineview/BLACKLIST +++ b/tests/auto/quick/qquickwebengineview/BLACKLIST @@ -3,3 +3,6 @@ windows [inputEventForwardingDisabledWhenActiveFocusOnPressDisabled] * + +[changeLocale] +windows |