summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-07-06 23:24:47 +0200
committerAndras Becsi <andras.becsi@digia.com>2013-07-09 13:58:24 +0200
commitac6ba5d4e2af478ae4793580603f8d9d0475e96d (patch)
tree47d557e73fc3fada7bf37ce507e7b930918adecb /build
parentdccb12ef0d2746a3112e04848ee831aaeda0a0da (diff)
Add QMAKE_FRAMEWORKPATH to gyp_generator.prf.
QMAKE_FRAMEWORKPATH contains the location of all the Qt frameworks on Mac. We need to add this variable to our gyp libraries sections in order to make sure that the linker can find the frameworks. Change-Id: I009ca834ca51dc969f2fadb12a3a98ac28f31a26 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'build')
-rw-r--r--build/qmake/mkspecs/features/gyp_generator.prf1
1 files changed, 1 insertions, 0 deletions
diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf
index 41aee69d9..9df87c4ec 100644
--- a/build/qmake/mkspecs/features/gyp_generator.prf
+++ b/build/qmake/mkspecs/features/gyp_generator.prf
@@ -68,6 +68,7 @@ macx {
FRAMEWORK_PATHS = $$unique(FRAMEWORK_PATHS)
FRAMEWORK_PATHS -= "-framework"
for (framework_path, FRAMEWORK_PATHS): GYP_CONTENTS += " '$$framework_path',"
+ !isEmpty(QMAKE_FRAMEWORKPATH): GYP_CONTENTS += " '-F$$QMAKE_FRAMEWORKPATH',"
GYP_CONTENTS += " ]," \
" },"