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

ClangCodeModel: Fix debug build with qmake

Browse Source 
Change-Id: Ia204ad0aeaeba2afb753e5bc54cf02285a9100e5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2021-05-19 08:41:19 +02:00
parent 6e0eb666c4
commit 4a3f5a7d3d
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
qtcreator.pri
View File

@@ -4,6 +4,8 @@ QTCREATOR_PRI_INCLUDED = 1
include($$PWD/qtcreator_ide_branding.pri) include($$PWD/qtcreator_ide_branding.pri)
!isEmpty(IDE_BRANDING_PRI): include($$IDE_BRANDING_PRI) !isEmpty(IDE_BRANDING_PRI): include($$IDE_BRANDING_PRI)
include(qtcreator_testvars.pri)
PRODUCT_BUNDLE_IDENTIFIER=$${PRODUCT_BUNDLE_ORGANIZATION}.$${IDE_ID} PRODUCT_BUNDLE_IDENTIFIER=$${PRODUCT_BUNDLE_ORGANIZATION}.$${IDE_ID}
VERSION = $$QTCREATOR_VERSION VERSION = $$QTCREATOR_VERSION
@@ -67,17 +69,6 @@ darwin:!minQtVersion(5, 7, 0) {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
} }
QTC_BUILD_TESTS = $$(QTC_BUILD_TESTS)
!isEmpty(QTC_BUILD_TESTS):TEST = $$QTC_BUILD_TESTS
!isEmpty(BUILD_TESTS):TEST = 1
isEmpty(TEST):CONFIG(debug, debug|release) {
!debug_and_release|build_pass {
TEST = 1
}
}
isEmpty(IDE_LIBRARY_BASENAME) { isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib IDE_LIBRARY_BASENAME = lib
} }

16
qtcreator_testvars.pri Normal file
View File

@@ -0,0 +1,16 @@
isEmpty(QTCREATOR_TESTVARS_PRI_INCLUDED) {
QTCREATOR_TESTVARS_PRI_INCLUDED = 1
QTC_BUILD_TESTS = $$(QTC_BUILD_TESTS)
!isEmpty(QTC_BUILD_TESTS):TEST = $$QTC_BUILD_TESTS
!isEmpty(BUILD_TESTS):TEST = 1
isEmpty(TEST):CONFIG(debug, debug|release) {
!debug_and_release|build_pass {
TEST = 1
}
}
}

2
src/qtcreatorplugin.pri
View File

@@ -1,3 +1,5 @@
include(../qtcreator_testvars.pri)
depfile = $$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri) depfile = $$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)
exists($$depfile) { exists($$depfile) {
include($$depfile) include($$depfile)