diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-12 14:31:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-12 14:31:01 +0200 |
| commit | 75696f96390ca6f818aa7fd13c1104a6eed6089b (patch) | |
| tree | 739057c8e3e8b8c45854e1f6950d2fb9eabe0bd1 /share/qtcreator/templates | |
| parent | 131ce54bee415934173be7369ec74e5899b355c1 (diff) | |
| parent | 07a5c196c42579538e458990454a657e03e618fb (diff) | |
Merge remote-tracking branch 'origin/4.9'
Change-Id: I95c56cc9371959f96afde3677fc82481f36f66c8
Diffstat (limited to 'share/qtcreator/templates')
| -rw-r--r-- | share/qtcreator/templates/wizards/autotest/wizard.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/qtcreator/templates/wizards/autotest/wizard.json b/share/qtcreator/templates/wizards/autotest/wizard.json index d9fe6257af..64e8b8d6af 100644 --- a/share/qtcreator/templates/wizards/autotest/wizard.json +++ b/share/qtcreator/templates/wizards/autotest/wizard.json @@ -1,13 +1,13 @@ { "version": 1, - "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ], + "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ], "id": "R.AutoTest", "category": "H.Project", "trDescription": "Creates a new unit test project. Unit tests allow you to verify that the code is fit for use and that there are no regressions.", "trDisplayName": "Auto Test Project", "trDisplayCategory": "Other Project", "icon": "autotest.png", - "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureDesktop" ], + "featuresRequired": [ "QtSupport.Wizards.FeatureDesktop" ], "enabled": "%{JS: [ %{Plugins} ].indexOf('AutoTest') >= 0}", "options": @@ -187,7 +187,7 @@ "enabled": "%{IsTopLevelProject}", "data": { "projectFilePath": "%{ProjectFilePath}", - "requiredFeatures": [ "%{JS: (('%{BuildSystem}' === 'cmake' && '%{TestFrameWork}' === 'QtTest') || '%{TestFrameWork}' === 'QtQuickTest') ? 'QtSupport.Wizards.FeatureQt.5' : 'QtSupport.Wizards.FeatureQt' }" ] + "requiredFeatures": [ "%{JS: ('%{TestFrameWork}' === 'QtQuickTest' ? 'QtSupport.Wizards.FeatureQt.5' : (('%{BuildSystem}' === 'qmake' || '%{TestFrameWork}' === 'QtTest') ? 'QtSupport.Wizards.FeatureQt' : 'DeviceType.Desktop' )) }" ] } }, { |