Remove gyp handling

Remove now dead GYP related code.

Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 25 insertions, 32 deletions

diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index fecee2536..f4f3fb736 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -4,11 +4,10 @@ include(core_common.pri)
 # Needed to set a CFBundleIdentifier
 QMAKE_INFO_PLIST = Info_mac.plist
 
-use?(gn): linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri
-else: linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}_linking.pri
+linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri
 
 !include($$linking_pri) {
-    error("Could not find the linking information that gyp/gn should have generated.")
+    error("Could not find the linking information that gn should have generated.")
 }
 
 load(qt_module)
@@ -19,30 +18,28 @@ api_library_path = $$OUT_PWD/api/$$getConfigDir()
 # Do not precompile any headers. We are only interested in the linker step.
 PRECOMPILED_HEADER =
 
-use?(gn){
-    isEmpty(NINJA_OBJECTS): error("Missing object files from QtWebEngineCore linking pri.")
-    isEmpty(NINJA_LFLAGS): error("Missing linker flags from QtWebEngineCore linking pri")
-    isEmpty(NINJA_ARCHIVES): error("Missing archive files from QtWebEngineCore linking pri")
-    isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking pri")
-    NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS))
-    # Do manual response file linking for macOS and Linux
-
-    RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp
-    for(object, NINJA_OBJECTS): RSP_CONTENT += $$object
-    write_file($$RSP_FILE, RSP_CONTENT)
-    macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE)
-    linux:LIBS_PRIVATE += @$$RSP_FILE
-    # QTBUG-58710 add main rsp file on windows
-    win32:QMAKE_LFLAGS += @$$RSP_FILE
-    linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group
-    else: LIBS_PRIVATE += $$NINJA_ARCHIVES
-    LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS
-    # GN's LFLAGS doesn't always work across all the Linux configurations we support.
-    # The Windows and macOS ones from GN does provide a few useful flags however
-    linux: QMAKE_LFLAGS += -Wl,--gc-sections -Wl,-O1 -Wl,-z,now -Wl,-z,defs
-    else: QMAKE_LFLAGS += $$NINJA_LFLAGS
-    POST_TARGETDEPS += $$NINJA_TARGETDEPS
-}
+isEmpty(NINJA_OBJECTS): error("Missing object files from QtWebEngineCore linking pri.")
+isEmpty(NINJA_LFLAGS): error("Missing linker flags from QtWebEngineCore linking pri")
+isEmpty(NINJA_ARCHIVES): error("Missing archive files from QtWebEngineCore linking pri")
+isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking pri")
+NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS))
+# Do manual response file linking for macOS and Linux
+
+RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp
+for(object, NINJA_OBJECTS): RSP_CONTENT += $$object
+write_file($$RSP_FILE, RSP_CONTENT)
+macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE)
+linux:LIBS_PRIVATE += @$$RSP_FILE
+# QTBUG-58710 add main rsp file on windows
+win32:QMAKE_LFLAGS += @$$RSP_FILE
+linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group
+else: LIBS_PRIVATE += $$NINJA_ARCHIVES
+LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS
+# GN's LFLAGS doesn't always work across all the Linux configurations we support.
+# The Windows and macOS ones from GN does provide a few useful flags however
+linux: QMAKE_LFLAGS += -Wl,--gc-sections -Wl,-O1 -Wl,-z,now -Wl,-z,defs
+else: QMAKE_LFLAGS += $$NINJA_LFLAGS
+POST_TARGETDEPS += $$NINJA_TARGETDEPS
 
 
 LIBS_PRIVATE += -L$$api_library_path
@@ -72,11 +69,7 @@ qtConfig(egl): CONFIG += egl
 
 linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
 
-use?(gn) {
-    REPACK_DIR = $$OUT_PWD/$$getConfigDir()
-} else {
-    REPACK_DIR = $$OUT_PWD/$$getConfigDir()/gen/repack
-}
+REPACK_DIR = $$OUT_PWD/$$getConfigDir()
 
 # Duplicated from resources/resources.gyp
 LOCALE_LIST = am ar bg bn ca cs da de el en-GB en-US es-419 es et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk vi zh-CN zh-TW