summaryrefslogtreecommitdiffstats
path: root/src/core/core_generator.pro
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-20 13:50:46 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-22 22:02:15 +0000
commitc5282c3479294f8d1c3ce310585aa9e3a8c4f4d7 (patch)
treebf4141bdf2aa48b69786d66514b4319a211462c7 /src/core/core_generator.pro
parentcd776aebe0a6505141b0392b79cca117de3c5ac3 (diff)
Remove gyp handling
Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/core_generator.pro')
-rw-r--r--src/core/core_generator.pro22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/core/core_generator.pro b/src/core/core_generator.pro
index 9c109146f..6f427757c 100644
--- a/src/core/core_generator.pro
+++ b/src/core/core_generator.pro
@@ -1,10 +1,6 @@
-use?(gn) {
- include(core_gn_config.pri)
- qtConfig(debug_and_release): CONFIG += debug_and_release
-} else {
- include(core_gyp_config.pri)
-}
+include(core_gn_config.pri)
+qtConfig(debug_and_release): CONFIG += debug_and_release
TEMPLATE = lib
@@ -13,15 +9,11 @@ include(core_common.pri)
macos {
# This fixes namespace builds on macOS. Specifically namespace ambiguity issues between Qt and
# Chromium forward declarations of NSString.
- contains(WEBENGINE_CONFIG, use_gn) {
- # The single quotes are present so that qmake iteration does not interpret the space as
- # delimiting a new value, they are removed before writing to the GN file, and the final shell
- # quoting is done by GN itself.
- forward_declaration_macro = "'Q_FORWARD_DECLARE_OBJC_CLASS(name)=class name;'"
- } else {
- # For GYP, quoting should be done by qmake itself.
- forward_declaration_macro = $$shell_quote(\"Q_FORWARD_DECLARE_OBJC_CLASS(name)=class name;\")
- }
+
+ # The single quotes are present so that qmake iteration does not interpret the space as
+ # delimiting a new value, they are removed before writing to the GN file, and the final shell
+ # quoting is done by GN itself.
+ forward_declaration_macro = "'Q_FORWARD_DECLARE_OBJC_CLASS(name)=class name;'"
} else {
forward_declaration_macro = "Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS"
}