summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2020-02-21 10:46:58 +0100
committerDominik Holland <dominik.holland@qt.io>2020-02-22 10:46:13 +0100
commite6e8bd526003448145f701d1a5a24b36d17f44a3 (patch)
treead65f76ed79003e4f9e8a75c5dfe59788b87d165
parentc8c3e7408c95d33328173249606a3070e7ce677d (diff)
downloadqtapplicationmanager-e6e8bd526003448145f701d1a5a24b36d17f44a3.tar.gz
Automatcially enable stack-walker for all windows builds
As windows is one of our development platforms, but not really a target platform, enable the stack-walker also for release builds, which is also what the installer provides. Change-Id: Iecbf26cc4a6d7af7e996e77235ebba2744eceb1f Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--application-manager.pro2
-rw-r--r--qmake-features/am-config.prf2
2 files changed, 2 insertions, 2 deletions
diff --git a/application-manager.pro b/application-manager.pro
index df058da1..db3ac898 100644
--- a/application-manager.pro
+++ b/application-manager.pro
@@ -52,7 +52,7 @@ linux:!android:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug|
check_libbacktrace = "no"
}
-windows:msvc:!disable-stackwalker:if(enable-stackwalker|CONFIG(debug, debug|release)|debug_and_release) {
+windows:msvc:!disable-stackwalker {
check_stackwalker = "yes"
SUBDIRS += 3rdparty/stackwalker/stackwalker.pro
} else {
diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf
index 4edfc8fc..01a98102 100644
--- a/qmake-features/am-config.prf
+++ b/qmake-features/am-config.prf
@@ -20,7 +20,7 @@ headless:DEFINES *= AM_HEADLESS
enable-widgets:DEFINES *= AM_ENABLE_WIDGETS
config_touchemulation:DEFINES += AM_ENABLE_TOUCH_EMULATION
linux:!android:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug|release)):DEFINES *= AM_USE_LIBBACKTRACE
-windows:msvc:!disable-stackwalker:if(enable-stackwalker|CONFIG(debug, debug|release)):DEFINES *= AM_USE_STACKWALKER
+windows:msvc:!disable-stackwalker: DEFINES *= AM_USE_STACKWALKER
!force-single-process {
linux|macos {