diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-16 13:23:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-16 15:27:22 +0200 |
| commit | fcb12a275f856b7f871aff8aae9f70a8e28635bc (patch) | |
| tree | 22a3a25b78c8d100b6e3811de3ab9007917e45ea /share/qtcreator/templates | |
| parent | e90a48e639af0c4a01f78a78ca3b33aef4f0a114 (diff) | |
| parent | e2e96cab52948b4404cac343bb3ad7c36ca9fafd (diff) | |
Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
src/plugins/projectexplorer/deploymentdata.cpp
src/plugins/projectexplorer/msvctoolchain.cpp
Change-Id: I64c304fc71435629a6a0060a9df71e8952699508
Diffstat (limited to 'share/qtcreator/templates')
| -rw-r--r-- | share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json index eedad020e3..0e562b124c 100644 --- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json @@ -1,6 +1,6 @@ { "version": 1, - "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ], + "supportedProjectTypes": [ "PythonProject" ], "id": "U.QtForPythonApplicationWindow", "category": "F.Application", "trDescription": "Creates a Qt for Python application that contains an empty window.", |