diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
| commit | 7ba225cb79c2d83bf7ed5dd249747541dd27a963 (patch) | |
| tree | 7afe909d92805ab0233dddb4bc796596a74df878 /qbs | |
| parent | 67e5eabc4af630c02ab15700f596b131c70b6ed8 (diff) | |
| parent | cabbeb1c5450b67ba649d77474b892d5acb0d622 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index cb914f7ef1..4e47b528ab 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -16,9 +16,7 @@ QtcProduct { project.buildDirectory + '/' + qtc.ide_plugin_path ] cpp.defines: base.filter(function(d) { - return d !== "QT_RESTRICTED_CAST_FROM_ASCII" - && d !== "QT_USE_FAST_OPERATOR_PLUS" - && d !== "QT_USE_FAST_CONCATENATION"; + return d !== "QT_RESTRICTED_CAST_FROM_ASCII"; }) Group { |