diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-02-07 16:47:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-15 09:45:07 +0000 |
| commit | 5f8e4afbba49c49d6e81b02d74505effc7b949ec (patch) | |
| tree | 02011a640e0237bd5162cf362424cb27e1c7a834 | |
| parent | a87cf9d74ff1103ae378968d6e94672585fd370b (diff) | |
Fix release builds for debug and release builds
Small typo makes debug builds make release.
Fix core lib and covert tool compilation for
debug builds.
Updates chromium:
b0bb0288 Fix debug builds compilation
Change-Id: Id478ab5e2a2a1b3d5716002f76f252451f69f5ac
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/mac_osx.pri | 3 | ||||
| -rw-r--r-- | src/core/gn_run.pro | 3 | ||||
| -rw-r--r-- | src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro | 5 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject cd3417bc8b5bae4cdc04a9dd714adadacc03b28 +Subproject b0bb02889e4df138c0b9e96e913bd95e7ab6252 diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index e52051b0c..be31eb643 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -29,7 +29,8 @@ use?(gn) { clang_base_path=\"$${QMAKE_CLANG_DIR}\" \ clang_use_chrome_plugins=false \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ - mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" + mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \ + toolkit_views=false use?(spellchecker) { use?(native_spellchecker): gn_args += use_browser_spellchecker=true diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index d33fe2394..e1af9e320 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -24,8 +24,9 @@ build_pass|!debug_and_release { gn_args = $$gnArgs() - CONFIG(release, debug|release): + CONFIG(release, debug|release) { gn_args += is_debug=false + } gn_args += "qtwebengine_target=\"$$shell_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\"" diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro index 7bece36cd..4f0de84e3 100644 --- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro +++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro @@ -27,6 +27,11 @@ use?(gn){ OBJECTS = } +#ninja compiles with std::__debug +use?(gn): linux: CONFIG(debug, debug|release) { + DEFINES += _GLIBCXX_DEBUG +} + # Fixme: -Werror=unused-parameter in core QMAKE_CXXFLAGS_WARN_ON = |