feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

don't add qbs-related flags to CONFIG over and over again

Browse Source 
Change-Id: I0ca49213d45ab7ab193266bbbc7f201cecdc6eac
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Oswald Buddenhagen
2014-08-08 11:11:55 +02:00
parent 7468ccc360
commit 3e08d94436
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qtcreator.pro
View File

@@ -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