diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-04-19 13:39:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-04 17:26:28 +0000 |
| commit | 37d68796ce8e9e6ddec39342f955a349d2298920 (patch) | |
| tree | c9b7329a93a90c4a72584329359303b5a18b4821 /tools/qmake/mkspecs/features/default_pre.prf | |
| parent | 7dde2a0d8b65f963268f9bacbcb96601ac34327b (diff) | |
Provide a debug version of QtWebEngineProcess
We never shipped a debug version of the QtWebEngineProcess executable.
This is problematic in debug_and_release builds when a debug application
starts the release version of QtWebEngineProcess. The Qt libraries will
then be loaded twice, in debug and release.
Also, in development setups where only the debug libraries are deployed,
the release version of QtWebEngineProcess cannot be loaded.
Task-number: QTBUG-49493
Change-Id: I2f7bfb9c7cf8e869dc91007f4e967a713f438065
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'tools/qmake/mkspecs/features/default_pre.prf')
| -rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 12 |
1 files changed, 11 insertions, 1 deletions
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 |