From 3e08d94436f1c0f40db69e4f754276145b83c827 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 8 Aug 2014 11:11:55 +0200
Subject: [PATCH] don't add qbs-related flags to CONFIG over and over again
Change-Id: I0ca49213d45ab7ab193266bbbc7f201cecdc6eac
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
qtcreator.pro | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/qtcreator.pro b/qtcreator.pro
index 5d22eb04098..ecddef5889c 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -65,8 +65,10 @@ minQtVersion(5, 0, 0):exists(src/shared/qbs/qbs.pro) {
cache(QBS_RELATIVE_PLUGINS_PATH)
QBS_RELATIVE_SEARCH_PATH = $$relative_path($$QBS_RESOURCES_BUILD_DIR, $$QBS_APPS_DESTDIR)
cache(QBS_RELATIVE_SEARCH_PATH)
- QBS_CONFIG_ADDITION = qbs_no_dev_install qbs_enable_project_file_updates
- cache(CONFIG, add, QBS_CONFIG_ADDITION)
+ !qbs_no_dev_install {
+ QBS_CONFIG_ADDITION = qbs_no_dev_install qbs_enable_project_file_updates
+ cache(CONFIG, add, QBS_CONFIG_ADDITION)
+ }
}
contains(QT_ARCH, i386): ARCHITECTURE = x86
--
GitLab