diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2020-01-21 16:01:44 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2020-01-21 16:13:18 +0100 |
| commit | 6393474dc5f8de581c5d2c07946d22990ff0f004 (patch) | |
| tree | 624cd1e393b2ef5e3f6507523aeb00a10d98bcfd /qmake-features | |
| parent | ea1421e218e330e27e1f059e55a6d6babb1f7c69 (diff) | |
| parent | 0c69e083ac5f5e97c9da09bdf1bd979dbe87ea93 (diff) | |
Merge remote-tracking branch 'gerrit/5.13' into 5.14
Change-Id: I3e8a149be99266ad6438759fda9acb1c9dd12448
Diffstat (limited to 'qmake-features')
| -rw-r--r-- | qmake-features/am-app.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake-features/am-app.prf b/qmake-features/am-app.prf index fe2f590a..0ca6d1fd 100644 --- a/qmake-features/am-app.prf +++ b/qmake-features/am-app.prf @@ -11,6 +11,10 @@ AM_MANIFEST_PATH = $$absolute_path($$AM_MANIFEST, $$_PRO_FILE_PWD_) # Call the appman-packager to convert the yaml to JSON to parse it here qtPrepareTool(APPMAN_PACKAGER, appman-packager, , system) +!exists($$APPMAN_PACKAGER): { + warning("Couldn't add the 'package' step, due to the missing appman-packager binary") + return() +} JSON = $$system($$APPMAN_PACKAGER yaml-to-json -i1 $$system_quote($$AM_MANIFEST_PATH)) parseJson(JSON, INFO)| error("Failed to parse appman-packager output.") |