diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2019-11-08 12:14:36 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2019-11-08 15:40:31 +0100 |
| commit | 967a522cde2f37a8648c7e5492f19e657db08c29 (patch) | |
| tree | dffb5a6ad815295b45af1cffa1ef914315eef8ae | |
| parent | 05a27d795ffa39341d9b8638a02571db79151f13 (diff) | |
Make the QML resource test less Linux specific
Change-Id: I89041381360cff321751988c6e562c03cdf39d86
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
| -rw-r--r-- | tests/qml/resources/am-config.yaml | 5 | ||||
| -rw-r--r-- | tests/qml/resources/apps/app1/app1.pro | 4 | ||||
| -rw-r--r-- | tests/qml/resources/apps/app1/info.yaml | 5 | ||||
| -rw-r--r-- | tests/qml/resources/apps/app2/app2.pro | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/tests/qml/resources/am-config.yaml b/tests/qml/resources/am-config.yaml index e204c0f2..5745dd2b 100644 --- a/tests/qml/resources/am-config.yaml +++ b/tests/qml/resources/am-config.yaml @@ -7,5 +7,6 @@ applications: ui: importPaths: "qrc:///qml" - resources: [ "${CONFIG_PWD}/systemuifile.rcc", - "${CONFIG_PWD}/libsystemuiplugin.so" ] + resources: + - "${CONFIG_PWD}/systemuifile.rcc" + - "${CONFIG_PWD}/systemuiplugin" # libsystemuiplugin.so would only work on Linux diff --git a/tests/qml/resources/apps/app1/app1.pro b/tests/qml/resources/apps/app1/app1.pro index b8a1fcac..cbbb4758 100644 --- a/tests/qml/resources/apps/app1/app1.pro +++ b/tests/qml/resources/apps/app1/app1.pro @@ -5,3 +5,7 @@ RESOURCES = app1plugin.qrc RESOURCE_SOURCE = app1file.qrc load(generate-resource) + +OTHER_FILES += \ + info.yaml \ + icon.png diff --git a/tests/qml/resources/apps/app1/info.yaml b/tests/qml/resources/apps/app1/info.yaml index ebf3e533..a5287f2c 100644 --- a/tests/qml/resources/apps/app1/info.yaml +++ b/tests/qml/resources/apps/app1/info.yaml @@ -12,5 +12,6 @@ applications: runtime: 'qml' runtimeParameters: importPaths: "qrc:///app1/qml" - resources: [ "app1file.rcc", - "libapp1plugin.so" ] + resources: + - app1file.rcc + - app1plugin # libapp1plugin.so would only work on Linux diff --git a/tests/qml/resources/apps/app2/app2.pro b/tests/qml/resources/apps/app2/app2.pro index b3ce1bd0..7a5190df 100644 --- a/tests/qml/resources/apps/app2/app2.pro +++ b/tests/qml/resources/apps/app2/app2.pro @@ -2,3 +2,7 @@ TEMPLATE = aux RESOURCE_SOURCE = app2.qrc load(generate-resource) + +OTHER_FILES += \ + info.yaml \ + icon.png |