summaryrefslogtreecommitdiff
path: root/qmake-features
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2017-02-03 02:16:53 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2017-02-06 18:04:07 +0000
commitb47fdff38be3851da7c0f3630878dda16afaedb0 (patch)
tree37729a7927a6134187390b8397f4a2b41618cb64 /qmake-features
parent63dfb8f094d6bf23cfa91207527b6b4251a8bfb3 (diff)
downloadqtapplicationmanager-b47fdff38be3851da7c0f3630878dda16afaedb0.tar.gz
Fixed some pro files
Change-Id: I148de27e08a2313cd8457c058552c9d7b2acdbd8 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'qmake-features')
-rw-r--r--qmake-features/am-config.prf2
-rw-r--r--qmake-features/am-qml-testcase.prf1
2 files changed, 1 insertions, 2 deletions
diff --git a/qmake-features/am-config.prf b/qmake-features/am-config.prf
index e7daf80d..1aaacaf8 100644
--- a/qmake-features/am-config.prf
+++ b/qmake-features/am-config.prf
@@ -12,7 +12,7 @@ win32-msvc*:QMAKE_CXXFLAGS += /FS /wd4290 /DNOMINMAX /D_CRT_SECURE_NO_WARNINGS
disable-installer:DEFINES *= AM_DISABLE_INSTALLER
systemd-workaround:DEFINES *= AM_SYSTEMD_WORKAROUND
headless:DEFINES *= AM_HEADLESS
-linux:if(enable-libbacktrace|CONFIG(debug, debug|release)):DEFINES *= AM_USE_LIBBACKTRACE
+linux:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug|release)):DEFINES *= AM_USE_LIBBACKTRACE
!force-single-process {
linux:if(qtHaveModule(compositor)|qtHaveModule(waylandcompositor)|headless):config_libdbus:CONFIG *= auto-multi-process
diff --git a/qmake-features/am-qml-testcase.prf b/qmake-features/am-qml-testcase.prf
index e8283220..83c39ef8 100644
--- a/qmake-features/am-qml-testcase.prf
+++ b/qmake-features/am-qml-testcase.prf
@@ -62,7 +62,6 @@ OTHER_FILES += $$AM_CONFIG
QMAKE_EXTRA_TARGETS *= check
-message("$$MODE")
# Execute a testrunner for every file
for(file, TEST_FILES) {
!equals(MODE, "single-process"):check.commands += $$COMMAND $$absolute_path($$file, $$_PRO_FILE_PWD_) --force-multi-process -- $(TESTARGS) &&