From e92b68b1a6755cd65b4066bea038a276c3386a44 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Wed, 11 Mar 2015 18:56:13 +0200 Subject: 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 Reviewed-by: Peng Wu Reviewed-by: Maurice Kalinowski --- mkspecs/features/winrt/package_manifest.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mkspecs') 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) } -- cgit v1.2.3