diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:50:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-22 22:02:15 +0000 |
| commit | c5282c3479294f8d1c3ce310585aa9e3a8c4f4d7 (patch) | |
| tree | bf4141bdf2aa48b69786d66514b4319a211462c7 /src/tools | |
| parent | cd776aebe0a6505141b0392b79cca117de3c5ac3 (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/tools')
| -rw-r--r-- | src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro index 2bdfee304..4e2c8c847 100644 --- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro +++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro @@ -1,34 +1,28 @@ option(host_build) # Look for linking information produced by gyp for our target according to core_generated.gyp -use?(gn): linking_pri = $$OUT_PWD/../../core/$$getConfigDir()/convert_dict.pri -else: linking_pri = $$OUT_PWD/../../core/$$getConfigDir()/convert_dict_linking.pri +linking_pri = $$OUT_PWD/../../core/$$getConfigDir()/convert_dict.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.") } -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") - OBJECTS = $$eval($$list($$NINJA_OBJECTS)) - linux { - LIBS_PRIVATE = -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group - } else { - LIBS_PRIVATE = $$NINJA_ARCHIVES - } - LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS - 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") +OBJECTS = $$eval($$list($$NINJA_OBJECTS)) +linux { + LIBS_PRIVATE = -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group } else { - # skip dummy main.cpp file - OBJECTS = + LIBS_PRIVATE = $$NINJA_ARCHIVES } +LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS +QMAKE_LFLAGS += $$NINJA_LFLAGS +POST_TARGETDEPS += $$NINJA_TARGETDEPS #ninja compiles with std::__debug -use?(gn): linux: CONFIG(debug, debug|release) { +linux: CONFIG(debug, debug|release) { DEFINES += _GLIBCXX_DEBUG } |