diff options
| author | Andrew Knight <andrew.knight@intopalo.com> | 2015-03-11 18:56:13 +0200 |
|---|---|---|
| committer | Andrew Knight <qt@panimo.net> | 2015-03-12 09:55:29 +0000 |
| commit | e92b68b1a6755cd65b4066bea038a276c3386a44 (patch) | |
| tree | 922ed6b564c9588cb0316e91e2b7ecf05e239e58 /mkspecs | |
| parent | c6f5cffcc09573ac196851f67f0be8d596c37c60 (diff) | |
qmake winrt package_manifest: Abort when uuidgen is not found
It's pretty easy to forget to run qmake from a vcvars prompt. Doing so
causes the UUID to get persistently written as empty, breaking the
vc project.
Change-Id: I5badb31ad4f606abbe8c71979019e097c748e07a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Peng Wu <peng.wu@intopalo.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 6726611f74..7e5effa438 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -71,7 +71,9 @@ exists($$UUID_CACHE) { include($$UUID_CACHE) } else { - WINRT_UUID = "WINRT_MANIFEST.identity = $$system(uuidgen)" + WINRT_UUID = $$system(uuidgen) + isEmpty(WINRT_UUID): error("Unable to generate a UUID. Make sure uuidgen is in your PATH.") + WINRT_UUID = "WINRT_MANIFEST.identity = $$WINRT_UUID" write_file($$UUID_CACHE, WINRT_UUID)|error("Unable to write the UUID cache; aborting.") eval($$WINRT_UUID) } |