From c3e3e41ad2492bd94f6856f73f28f3d09326aa50 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 19 Feb 2014 15:33:57 +0100 Subject: Fix the Mac build with a -no-framework Qt If QMAKE_FRAMEWORKPATH is empty, this would add an empty entry to the list and would end up with a -F with no argument added to the clang command line. This would fail the build since the next switch would be eaten by the -F. Change-Id: I42657e781278fd56d6664a42fb4222eb83b3cd73 Reviewed-by: Pierre Rossi --- tools/qmake/mkspecs/features/gyp_generator.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index 20cde1d6d..e19c9568c 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -82,7 +82,7 @@ for (lib, LIBS): GYP_CONTENTS += " '$$lib'," for (rpath, QMAKE_RPATHDIR): GYP_CONTENTS += " '$$QMAKE_RPATH$$rpath'," GYP_CONTENTS += " ]," -macx { +!isEmpty(QMAKE_FRAMEWORKPATH) { GYP_CONTENTS += " 'mac_framework_dirs': [" GYP_CONTENTS += " '$$QMAKE_FRAMEWORKPATH'," GYP_CONTENTS += " ]," -- cgit v1.2.3