summaryrefslogtreecommitdiff
path: root/qmake-features
diff options
context:
space:
mode:
authorBernd Weimer <bernd.weimer@pelagicore.com>2019-07-04 17:31:00 +0200
committerBernd Weimer <bernd.weimer@pelagicore.com>2019-08-13 13:55:10 +0200
commit1608b6a0a775f3efc0ca8d958f905b3063cc6bfc (patch)
tree9f77ad8ad3e2b17a902a31d5295a6e7012908f63 /qmake-features
parentd7c39b1e0c7593ef281b5e7ff37cd4b67d72f8c1 (diff)
downloadqtapplicationmanager-1608b6a0a775f3efc0ca8d958f905b3063cc6bfc.tar.gz
Add support for Qt resources
Qt resources can be added in the form of resource files or libraries that have resources compiled-in. The resource file system can be accessed with the ":" or "qrc://" prefix. Change-Id: I947d00de964f55cd6f6be173ff2f93d073aadc82 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'qmake-features')
-rw-r--r--qmake-features/am-qml-testcase.prf6
-rw-r--r--qmake-features/generate-resource.prf10
2 files changed, 13 insertions, 3 deletions
diff --git a/qmake-features/am-qml-testcase.prf b/qmake-features/am-qml-testcase.prf
index b475deed..923920fe 100644
--- a/qmake-features/am-qml-testcase.prf
+++ b/qmake-features/am-qml-testcase.prf
@@ -55,7 +55,8 @@ OTHER_FILES += $$IMPORTS_DIR
# Read a config file
for(config, AM_CONFIG) {
- COMMAND += -c $$absolute_path($$config, $$_PRO_FILE_PWD_)
+ isEmpty(TESTRUN_CWD): COMMAND += -c $$absolute_path($$config, $$_PRO_FILE_PWD_)
+ else: COMMAND += -c $$config
}
OTHER_FILES += $$AM_CONFIG
@@ -82,8 +83,7 @@ OTHER_FILES += $$TEST_FILES
# Copy assets to build folder
for (d , DIRECTORIES) {
- win32: do_copydata.commands += $(COPY_DIR) $$shell_path($$_PRO_FILE_PWD_/$${d}) $$shell_path($$OUT_PWD/$${d}) $$escape_expand(\n\t)
- else: do_copydata.commands += $(COPY_DIR) $$shell_path($$_PRO_FILE_PWD_/$${d}) $$shell_path($$OUT_PWD) $$escape_expand(\n\t)
+ do_copydata.commands += $(COPY_DIR) $$shell_path($$_PRO_FILE_PWD_/$${d}) $$shell_path($$OUT_PWD/$${d}) $$escape_expand(\n\t)
}
for (f , FILES) {
do_copydata.commands += $(COPY) $$shell_path($$_PRO_FILE_PWD_/$${f}) $$shell_path($$OUT_PWD/$${f}) $$escape_expand(\n\t)
diff --git a/qmake-features/generate-resource.prf b/qmake-features/generate-resource.prf
new file mode 100644
index 00000000..54c40cea
--- /dev/null
+++ b/qmake-features/generate-resource.prf
@@ -0,0 +1,10 @@
+load(resources)
+
+generate_rcc.input = RESOURCE_SOURCE
+generate_rcc.name = RCC Generator
+generate_rcc.depend_command = $$QMAKE_RCC_DEP -list -binary ${QMAKE_FILE_IN}
+generate_rcc.CONFIG += dep_lines target_predeps no_link
+generate_rcc.output = ${QMAKE_FILE_BASE}.rcc
+generate_rcc.commands = $$QMAKE_RCC -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+
+QMAKE_EXTRA_COMPILERS += generate_rcc