summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-02-03 16:14:37 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-02-06 09:54:41 +0000
commit79ad6bad373bb5151ba7c3410609a9fee009be58 (patch)
tree9db37c2ec44be90406671415cdb1a7e94ad65463 /tools
parentb183be09b52c6e7243ebecd7d98d4c34386b1dee (diff)
Fix framework builds
Gn does not support mac_framework_dirs, pass '-F' flag instead for frameworks builds. Change-Id: Ie050b272805ae1ad14a98816a92696a9dcc017b3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/gn_generator.prf12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/qmake/mkspecs/features/gn_generator.prf b/tools/qmake/mkspecs/features/gn_generator.prf
index 5796c39a..0e4451fa 100644
--- a/tools/qmake/mkspecs/features/gn_generator.prf
+++ b/tools/qmake/mkspecs/features/gn_generator.prf
@@ -110,18 +110,18 @@ GN_CONTENTS += "$${TARGET_TYPE}(\"$$TARGET\") {"
for (imp, GN_IMPORTS): GN_CONTENTS += " import(\"$$imp\")"
}
-!isEmpty(QMAKE_FRAMEWORKPATH) {
- GN_CONTENTS += " mac_framework_dirs = ["
- for(path, QMAKE_FRAMEWORKPATH): GN_CONTENTS += " \"$$path\","
- GN_CONTENTS += " ]"
-}
-
!isEmpty(QMAKE_CFLAGS) {
GN_CONTENTS += " cflags = ["
for(flag, QMAKE_CFLAGS): GN_CONTENTS += " \"$$filter_flag_values($$flag)\","
GN_CONTENTS += " ]"
}
+!isEmpty(QMAKE_FRAMEWORKPATH) {
+ GN_CONTENTS += " cflags += ["
+ for(path, QMAKE_FRAMEWORKPATH): GN_CONTENTS += " \"-F$$path\","
+ GN_CONTENTS += " ]"
+}
+
# Stop the barrage of unused variables warnings.
gcc|clang {
QMAKE_CXXFLAGS += "-Wno-unused-parameter"