diff options
author | Andy Shaw <andy.shaw@qt.io> | 2020-01-14 09:23:28 +0100 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2020-02-10 21:04:03 +0000 |
commit | 288d5d8a7144ab05885fc446e945f17e8d546820 (patch) | |
tree | c5c837bff4cd70f4b37812ab600a7cbd29e9a6a2 /mkspecs/features | |
parent | 5b59b2ea155230f6ff9474fb3b5fae856b07ae5b (diff) |
Android: Make sure that it can find qrc files created via the pro file
Since Android will place the created qrc files in their own architecture
then we need to make sure that we account for this when returning a list
of all the resources. This is so that when other files are created that
depend on this list, it is able to find them.
Fixes: QTBUG-81477
Change-Id: I4a083c1c5c3e0aec35649cf7f5419cf3c6a75eae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/resources_functions.prf | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index f0ca2ed793..fe2dc17d4d 100644 --- a/mkspecs/features/resources_functions.prf +++ b/mkspecs/features/resources_functions.prf @@ -34,7 +34,18 @@ defineTest(qtFlattenResources) { next() } - resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) + RESOURCES -= $$resource + !android|isEmpty(BUILDS)|build_pass { + resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) + RESOURCES += $$resource_file + } else { + # Android will need a resource file for each architecture make sure it is placed + # correctly for other functions that need the right paths for these files + for (arch, ANDROID_ABIS) { + resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD/$$arch) + RESOURCES += $$resource_file + } + } isEmpty(BUILDS)|build_pass { # Collection of files, generate qrc file @@ -69,9 +80,6 @@ defineTest(qtFlattenResources) { !write_file($$resource_file, resource_file_content): \ error() } - - RESOURCES -= $$resource - RESOURCES += $$resource_file } export(RCC_DIR) export(QMAKE_RESOURCES_IMMEDIATE_NR) |