summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-01-14 17:39:19 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-14 20:47:29 +0100
commit74ffcbf0cfe0235b5c09515231ff13543388d28b (patch)
tree493d4f9dc023b12a3ceea805c6b356773c8e8c2b
parentfe458bc0e3658e23a0fc15faf431639568211332 (diff)
Mac: Add QMAKE_FRAMEWORKPATH to compiler command line as well.
This is necessary for the compiler to find include files following the "#include <FRAMEWORK/file>" syntax. Change-Id: Ia40b6bbe571e2b275a502c2de60cceeecc9b0f6b Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
-rw-r--r--tools/qmake/mkspecs/features/gyp_generator.prf6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index 4a4a8106d..b1dcac19f 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -82,6 +82,12 @@ for (lib, LIBS): GYP_CONTENTS += " '$$lib',"
for (rpath, QMAKE_RPATHDIR): GYP_CONTENTS += " '$$QMAKE_RPATH$$rpath',"
GYP_CONTENTS += " ],"
+macx {
+ GYP_CONTENTS += " 'mac_framework_dirs': ["
+ GYP_CONTENTS += " '$$QMAKE_FRAMEWORKPATH',"
+ GYP_CONTENTS += " ],"
+}
+
!isEmpty(QMAKE_CFLAGS) {
GYP_CONTENTS += " 'cflags': ["
for(flag, QMAKE_CFLAGS): GYP_CONTENTS += " '$$flag',"