diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
commit | 2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d (patch) | |
tree | 504e526cbb840733a316714c890fb25d1d64eb1c /tests/auto/quick/qmltests/qmltests.pro | |
parent | 2c246e60e886b082e7438cf8f68cdc22bc919fd9 (diff) | |
parent | f5ec28285ab7f71d6d75af963ae499603da6630e (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I78c25caf30923fc1101b137f9abc3993e3cf0600
Diffstat (limited to 'tests/auto/quick/qmltests/qmltests.pro')
-rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index c2e915c35..a8a63fd5a 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -7,6 +7,9 @@ IMPORTPATH += $$PWD/data OTHER_FILES += \ $$PWD/data/TestWebEngineView.qml \ $$PWD/data/alert.html \ + $$PWD/data/append-document-title.js \ + $$PWD/data/big-user-script.js \ + $$PWD/data/change-document-title.js \ $$PWD/data/confirm.html \ $$PWD/data/favicon.html \ $$PWD/data/favicon.png \ @@ -36,6 +39,9 @@ OTHER_FILES += \ $$PWD/data/tst_properties.qml \ $$PWD/data/tst_runJavaScript.qml \ $$PWD/data/tst_titleChanged.qml \ + $$PWD/data/tst_unhandledKeyEventPropagation.qml \ + $$PWD/data/tst_userScripts.qml \ + $$PWD/data/tst_webchannel.qml \ $$PWD/data/tst_keyboardModifierMapping.qml \ $$PWD/mock-delegates/QtWebEngine/UIDelegates/AlertDialog.qml \ $$PWD/mock-delegates/QtWebEngine/UIDelegates/ConfirmDialog.qml \ @@ -46,7 +52,7 @@ OTHER_FILES += \ load(qt_build_paths) -DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}data\\\"\" +DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\" !isQMLTestSupportApiEnabled() { PLUGIN_EXTENSION = .so |