summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-07-26 13:05:21 +0200
committerhjk <hjk@qt.io>2018-07-26 11:18:06 +0000
commit5787ecb025c668c988e5bb4881c307b0df1a7e2f (patch)
tree0629c867b4ed404ed76d862881485107d1d215e2
parent8e8598f2a34766880506f3cc4a3e4fb325eb29bb (diff)
downloadqt-creator-5787ecb025c668c988e5bb4881c307b0df1a7e2f.tar.gz
Revert "Wizards: Drop support for Qt4 for widgets application"
This reverts commit 1a6522b47c7eb667d297c71a48751e22f7069c04 which leaves people wondering about their kit setups. Creating a project that possibly does not compile due to the use of C++11's nullptr in the generated code is lesser evil. Apart from that this potential mis-compilation does not happen in practice on e.g. Ubuntu 18.04 with system Qt 4 and system compiler. Change-Id: Iaa90f225d5317dc48428aa2d3fcf3ec051ef2018 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp3
-rw-r--r--src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
index 88aa898949..fd6cbc475e 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
@@ -78,8 +78,7 @@ GuiAppWizard::GuiAppWizard()
"Includes a Qt Designer-based main window.\n\n"
"Preselects a desktop Qt for building the application if available."));
setIcon(QIcon(QLatin1String(":/wizards/images/gui.png")));
- auto qt5 = Core::Id::fromString(QString(QtSupport::Constants::FEATURE_QT_PREFIX).append(".5"));
- setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS, qt5});
+ setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS});
}
Core::BaseFileWizard *GuiAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
index 0bdf1a3a7d..5f12fdc41a 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
@@ -84,7 +84,6 @@ QtProjectParameters GuiAppWizardDialog::projectParameters() const
rc.path = path();
rc.selectedModules = selectedModulesList();
rc.deselectedModules = deselectedModulesList();
- rc.qtVersionSupport = QtProjectParameters::SupportQt5Only;
return rc;
}