Commit c3e3e41a authored by Jocelyn Turcotte's avatar Jocelyn Turcotte Committed by The Qt Project
Browse files

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: default avatarPierre Rossi <pierre.rossi@gmail.com>
Showing with 1 addition and 1 deletion
......@@ -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 += " ],"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment