From 5787ecb025c668c988e5bb4881c307b0df1a7e2f Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 26 Jul 2018 13:05:21 +0200 Subject: [PATCH] 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 --- src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp | 3 +-- src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp index 88aa8989495..fd6cbc475e0 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 ¶meters) const diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp index 0bdf1a3a7de..5f12fdc41a0 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; }