diff options
author | Robert Griebl <robert.griebl@pelagicore.com> | 2019-08-05 14:47:37 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@pelagicore.com> | 2019-08-05 16:19:22 +0200 |
commit | 1b3a165b78a97805a0c596e1d13543f1d83b56ef (patch) | |
tree | cecb1317d10bd8f70e379832771a91c63e5e7817 | |
parent | 92ed0c7845a15adfaef442a6d26ac337a88c3d47 (diff) | |
download | qtapplicationmanager-1b3a165b78a97805a0c596e1d13543f1d83b56ef.tar.gz |
Make all files known to QtCreator
This makes it way easier to do a global search&replace in the project.
Plus you actually always see what's there, even if it's not built by default.
Change-Id: If51a8c502a0b07efc8cae55ecd37aa5c64244482
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
-rw-r--r-- | application-manager.pro | 1 | ||||
-rw-r--r-- | examples/applicationmanager/multi-views/multi-views.pro | 2 | ||||
-rw-r--r-- | qmake-features/am-qml-testcase.prf | 3 | ||||
-rw-r--r-- | tests/manual/manual.pro | 6 | ||||
-rw-r--r-- | tests/manual/monitormodel/monitormodel.pro | 5 | ||||
-rw-r--r-- | tests/qml/configs/configs.pro | 1 | ||||
-rw-r--r-- | tests/qml/crash/crash.pro | 2 | ||||
-rw-r--r-- | tests/qml/intents/intents.pro | 4 | ||||
-rw-r--r-- | tests/qml/quicklaunch/quicklaunch.pro | 1 | ||||
-rw-r--r-- | tests/qml/simple/simple.pro | 1 | ||||
-rw-r--r-- | tests/qml/windowitem/windowitem.pro | 1 | ||||
-rw-r--r-- | tests/qml/windowitem2/windowitem2.pro | 1 | ||||
-rw-r--r-- | tests/qml/windowmanager/windowmanager.pro | 2 | ||||
-rw-r--r-- | tests/qml/windowmapping/windowmapping.pro | 8 | ||||
-rw-r--r-- | tests/signature/signature.pro | 2 | ||||
-rw-r--r-- | tests/tests.pro | 2 |
16 files changed, 39 insertions, 3 deletions
diff --git a/application-manager.pro b/application-manager.pro index b4b39fb9..53e6c99e 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -116,6 +116,7 @@ OTHER_FILES += \ LICENSE.*[^~] \ config.tests/libarchive/* \ config.tests/libyaml/* \ + config.tests/touchemulation/* \ util/bash/appman-prompt \ util/bash/README \ diff --git a/examples/applicationmanager/multi-views/multi-views.pro b/examples/applicationmanager/multi-views/multi-views.pro index 2cff5f66..e7e041b9 100644 --- a/examples/applicationmanager/multi-views/multi-views.pro +++ b/examples/applicationmanager/multi-views/multi-views.pro @@ -4,6 +4,8 @@ CONFIG += am-systemui OTHER_FILES += \ am-config.yaml \ system-ui/*.qml \ + doc/src/*.qdoc \ + doc/images/*.png \ apps/tld.multi-views.app/*.yaml \ apps/tld.multi-views.app/*.qml \ apps/tld.multi-views.app/*.png \ diff --git a/qmake-features/am-qml-testcase.prf b/qmake-features/am-qml-testcase.prf index c7f2396a..b475deed 100644 --- a/qmake-features/am-qml-testcase.prf +++ b/qmake-features/am-qml-testcase.prf @@ -93,3 +93,6 @@ for (f , FILES) { check.depends = do_copydata QMAKE_EXTRA_TARGETS += do_copydata } + +# Make sure that possible apps are in OTHER_FILES +for (app, TEST_APPS): OTHER_FILES += apps/$${app}/*.yaml apps/$${app}/*.qml apps/$${app}/*.png diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro new file mode 100644 index 00000000..49d5c3b4 --- /dev/null +++ b/tests/manual/manual.pro @@ -0,0 +1,6 @@ +requires(false) # visible in QtCreator, but not built by default + +TEMPLATE = subdirs + +SUBDIRS = \ + monitormodel \ diff --git a/tests/manual/monitormodel/monitormodel.pro b/tests/manual/monitormodel/monitormodel.pro new file mode 100644 index 00000000..7c2e33bc --- /dev/null +++ b/tests/manual/monitormodel/monitormodel.pro @@ -0,0 +1,5 @@ +TEMPLATE = aux + +OTHER_FILES = \ + *.qml \ + README \ diff --git a/tests/qml/configs/configs.pro b/tests/qml/configs/configs.pro index 1ba0ab11..86604d5e 100644 --- a/tests/qml/configs/configs.pro +++ b/tests/qml/configs/configs.pro @@ -2,6 +2,7 @@ load(am-config) AM_CONFIG = am-config.yaml TEST_FILES = tst_configs.qml +TEST_APPS = test.configs.app TEST_CONFIGURATIONS = "--force-single-process" \ "--force-single-process --single-app $$_PRO_FILE_PWD_/apps/test.configs.app/info.yaml" multi-process { diff --git a/tests/qml/crash/crash.pro b/tests/qml/crash/crash.pro index 160c90af..b3bff364 100644 --- a/tests/qml/crash/crash.pro +++ b/tests/qml/crash/crash.pro @@ -1,4 +1,6 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_crash.qml +TEST_APPS = tld.test.crash load(am-qml-testcase) + diff --git a/tests/qml/intents/intents.pro b/tests/qml/intents/intents.pro index ae6415a6..797f96e8 100644 --- a/tests/qml/intents/intents.pro +++ b/tests/qml/intents/intents.pro @@ -1,7 +1,5 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_intents.qml - -APPS = intents1 intents2 cannot-start -for (app, APPS): OTHER_FILES += apps/$${app}/*.yaml apps/$${app}/*.qml apps/$${app}/*.png +TEST_APPS = intents1 intents2 cannot-start load(am-qml-testcase) diff --git a/tests/qml/quicklaunch/quicklaunch.pro b/tests/qml/quicklaunch/quicklaunch.pro index 4c6b8f74..2d990a4b 100644 --- a/tests/qml/quicklaunch/quicklaunch.pro +++ b/tests/qml/quicklaunch/quicklaunch.pro @@ -1,4 +1,5 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_quicklaunch.qml +TEST_APPS = tld.test.quicklaunch load(am-qml-testcase) diff --git a/tests/qml/simple/simple.pro b/tests/qml/simple/simple.pro index 375f62c5..72dbea95 100644 --- a/tests/qml/simple/simple.pro +++ b/tests/qml/simple/simple.pro @@ -1,4 +1,5 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_applicationmanager.qml +TEST_APPS = tld.test.simple1 tld.test.simple2 load(am-qml-testcase) diff --git a/tests/qml/windowitem/windowitem.pro b/tests/qml/windowitem/windowitem.pro index d2755653..fcc1b1f6 100644 --- a/tests/qml/windowitem/windowitem.pro +++ b/tests/qml/windowitem/windowitem.pro @@ -1,4 +1,5 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_windowitem.qml +TEST_APPS = test.windowitem.app test.windowitem.multiwin load(am-qml-testcase) diff --git a/tests/qml/windowitem2/windowitem2.pro b/tests/qml/windowitem2/windowitem2.pro index fe1ab58a..022ea053 100644 --- a/tests/qml/windowitem2/windowitem2.pro +++ b/tests/qml/windowitem2/windowitem2.pro @@ -1,4 +1,5 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_windowitem2.qml +TEST_APPS = test.windowitem2.app load(am-qml-testcase) diff --git a/tests/qml/windowmanager/windowmanager.pro b/tests/qml/windowmanager/windowmanager.pro index d9b687eb..1e291c00 100644 --- a/tests/qml/windowmanager/windowmanager.pro +++ b/tests/qml/windowmanager/windowmanager.pro @@ -1,4 +1,6 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_windowmanager.qml +OTHER_FILES += IviApplicationExtension.qml + load(am-qml-testcase) diff --git a/tests/qml/windowmapping/windowmapping.pro b/tests/qml/windowmapping/windowmapping.pro index 59fa55b0..e29aba28 100644 --- a/tests/qml/windowmapping/windowmapping.pro +++ b/tests/qml/windowmapping/windowmapping.pro @@ -1,4 +1,12 @@ AM_CONFIG = am-config.yaml TEST_FILES = tst_windowmapping.qml +TEST_APPS = \ + test.winmap.amwin \ + test.winmap.amwin2 \ + test.winmap.loader \ + test.winmap.ping \ + test.winmap.qtobject \ + test.winmap.rectangle \ + test.winmap.window \ load(am-qml-testcase) diff --git a/tests/signature/signature.pro b/tests/signature/signature.pro index 77ff71f1..43bb3d47 100644 --- a/tests/signature/signature.pro +++ b/tests/signature/signature.pro @@ -6,4 +6,6 @@ QT *= appman_common-private appman_crypto-private SOURCES += tst_signature.cpp +OTHER_FILES += create-test-data.sh + RESOURCES += tst_signature.qrc diff --git a/tests/tests.pro b/tests/tests.pro index 0b9409df..6cfe294b 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = \ + manual \ application \ applicationinfo \ main \ @@ -25,6 +26,7 @@ OTHER_FILES += \ tests.pri \ data/create-test-packages.sh \ data/certificates/create-test-certificates.sh \ + data/utilities.sh \ # sadly, the appman-packager is too complex to build as a host tool !cross_compile { |