diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-19 15:33:57 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 11:41:56 +0100 |
commit | c3e3e41ad2492bd94f6856f73f28f3d09326aa50 (patch) | |
tree | be57f855ef9a8b99a0c3215d4089e8de2ca384d3 /tools/qmake | |
parent | a6b35538acf4e3a8aad64932d8514040e2d36e68 (diff) |
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 <pierre.rossi@gmail.com>
Diffstat (limited to 'tools/qmake')
-rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf | 2 |
1 files changed, 1 insertions, 1 deletions
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 += " ]," |