diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
| commit | db9837fa6c9401e898ac8e7492081a6e21c71790 (patch) | |
| tree | d542a089711257402ac4fe70813fa0e7de825f2e /qbs/modules | |
| parent | 7bc14bf3498ea6b1c19abacf85a5103772da26bc (diff) | |
| parent | 58747b2de107e8f6ac00daeb431ecbf3e603fd34 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/clangtools/clangtoolruncontrol.cpp
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
Diffstat (limited to 'qbs/modules')
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index a8af9d5891..976dbf7cb3 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -69,6 +69,7 @@ Module { property string export_data_base: project.ide_source_tree + "/share/qtcreator" property bool testsEnabled: Environment.getEnv("TEST") || qbs.buildVariant === "debug" + property bool useSystemBotan: Environment.getEnv("USE_SYSTEM_BOTAN") === "1" property stringList generalDefines: [ "QT_CREATOR", 'IDE_LIBRARY_BASENAME="' + libDirName + '"', |