diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-10 16:58:00 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-10 16:58:12 +0200 |
commit | e5157941181f6bb5e906377e68af9bbe2ab55795 (patch) | |
tree | e0f109b51e8faa44cb36ca2ac95d8cd1b4387be2 /tools | |
parent | c2f7f09974959c252a5e2879adfffe6356543fff (diff) | |
parent | 023168cf91dc7ac11ced1b6a60ca7aa248987810 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I02117cbd7ad655005b70daa97fd9db7b0918a5d1
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 4 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 0dfb67a84..679b282b3 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -64,6 +64,9 @@ defineTest(runConfigure) { } } + # Spellcheck support is moved to dev + WEBENGINE_CONFIG += no_spellcheck + isEmpty(skipBuildReason): { cache(CONFIG, add, $$list(webengine_successfully_configured)) !isEmpty(WEBENGINE_CONFIG) { @@ -71,6 +74,7 @@ defineTest(runConfigure) { export(WEBENGINE_CONFIG) } } + } # This is called from default_post, at which point we've also parsed diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index cb0625c2e..27aded013 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -4,7 +4,17 @@ QTWEBENGINE_ROOT = $$replace(PWD, /tools/qmake/mkspecs/features$,) # We depend on libc++ to build chromium so our macosx-version-min has to be 10.7 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 -QTWEBENGINEPROCESS_NAME = QtWebEngineProcess +QTWEBENGINEPROCESS_NAME_RELEASE = QtWebEngineProcess +debug_and_release { + QTWEBENGINEPROCESS_NAME_DEBUG = $$join(QTWEBENGINEPROCESS_NAME_RELEASE,,,d) +} else { + QTWEBENGINEPROCESS_NAME_DEBUG = $$QTWEBENGINEPROCESS_NAME_RELEASE +} +build_pass:CONFIG(debug, debug|release) { + QTWEBENGINEPROCESS_NAME = $$QTWEBENGINEPROCESS_NAME_DEBUG +} else { + QTWEBENGINEPROCESS_NAME = $$QTWEBENGINEPROCESS_NAME_RELEASE +} # Location of sync.profile MODULE_BASE_DIR = $$QTWEBENGINE_ROOT |