diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 11:04:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 12:55:06 +0200 |
| commit | 22556f899ffd91650c1a1d5a8d71016358291859 (patch) | |
| tree | 320dfdcd26a3cd078738da5a0ab9b8ea373fde29 /tests/auto/quick/qmltests/qmltests.pro | |
| parent | b715310a4fdc2a5e215c99bae042cd820e9a1e27 (diff) | |
| parent | dc16cdd60449112343d43852960142db7fd155fd (diff) | |
Merge branch '5.5' into 5.6
Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c
Diffstat (limited to 'tests/auto/quick/qmltests/qmltests.pro')
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index aac0c449c..01517af47 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -17,6 +17,7 @@ OTHER_FILES += \ $$PWD/data/favicon.png \ $$PWD/data/favicon2.html \ $$PWD/data/forms.html \ + $$PWD/data/geolocation.html \ $$PWD/data/javascript.html \ $$PWD/data/link.html \ $$PWD/data/prompt.html \ @@ -35,6 +36,7 @@ OTHER_FILES += \ $$PWD/data/tst_favIconLoad.qml \ $$PWD/data/tst_filePicker.qml \ $$PWD/data/tst_formValidation.qml \ + $$PWD/data/tst_geopermission.qml \ $$PWD/data/tst_javaScriptDialogs.qml \ $$PWD/data/tst_linkHovered.qml \ $$PWD/data/tst_loadFail.qml \ |