diff options
| author | Jake Petroules <[email protected]> | 2016-11-11 12:34:54 -0800 |
|---|---|---|
| committer | Jani Heikkinen <[email protected]> | 2016-11-17 19:34:21 +0000 |
| commit | db6c31af0177025f178cb42d5febbdc47dc87778 (patch) | |
| tree | 3b9244cb6579c01de6439784c91d82b1037441f0 | |
| parent | 35953be53bfe06f01f6b8cfde70d7e793341e481 (diff) | |
qmake: fix installation of asset catalog files
This strips leading whitespace from asset catalog filenames, which was
causing installation to fail due to incorrectly calculated paths.
Task-number: QTBUG-57090
Change-Id: I80db627262f9d58f4403e2d8ab205bef2113992b
(cherry picked from commit addf1f45f3e2c37a09ef7f7bab909467c2bf79f7)
Reviewed-by: Jake Petroules <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
| -rw-r--r-- | mkspecs/features/mac/asset_catalogs.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/mac/asset_catalogs.prf b/mkspecs/features/mac/asset_catalogs.prf index 57d93d56d53..87875136c28 100644 --- a/mkspecs/features/mac/asset_catalogs.prf +++ b/mkspecs/features/mac/asset_catalogs.prf @@ -65,7 +65,7 @@ actool_output_files = $$system(\ mkdir -p $$system_quote($$QMAKE_ASSET_CATALOGS_BUILD_PATH) && \ /usr/libexec/PlistBuddy -c \'Print :com.apple.actool.compilation-results:output-files\' \ - /dev/stdin <<< $($${asset_catalog_compiler.commands} 2>/dev/null) | grep \'^ .*$\', lines) + /dev/stdin <<< $($${asset_catalog_compiler.commands} 2>/dev/null) | sed -Ene \'s/^ +//p\', lines) for (output_file, actool_output_files) { !equals(output_file, $$asset_catalog_compiler.target): \ |