diff options
| -rw-r--r-- | qtcreator.pri | 13 | ||||
| -rw-r--r-- | qtcreator_testvars.pri | 16 | ||||
| -rw-r--r-- | src/qtcreatorplugin.pri | 2 |
3 files changed, 20 insertions, 11 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 5c586e2d76..584e3970d0 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -4,6 +4,8 @@ QTCREATOR_PRI_INCLUDED = 1 include($$PWD/qtcreator_ide_branding.pri) !isEmpty(IDE_BRANDING_PRI): include($$IDE_BRANDING_PRI) +include(qtcreator_testvars.pri) + PRODUCT_BUNDLE_IDENTIFIER=$${PRODUCT_BUNDLE_ORGANIZATION}.$${IDE_ID} VERSION = $$QTCREATOR_VERSION @@ -67,17 +69,6 @@ darwin:!minQtVersion(5, 7, 0) { 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) { IDE_LIBRARY_BASENAME = lib } diff --git a/qtcreator_testvars.pri b/qtcreator_testvars.pri new file mode 100644 index 0000000000..cf2e1c1a8c --- /dev/null +++ b/qtcreator_testvars.pri @@ -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 + } + } + +} diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 806ed6f865..4bb8e89853 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -1,3 +1,5 @@ +include(../qtcreator_testvars.pri) + depfile = $$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri) exists($$depfile) { include($$depfile) |