From 1a6522b47c7eb667d297c71a48751e22f7069c04 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 22 Jun 2018 10:13:50 +0200 Subject: [PATCH] Wizards: Drop support for Qt4 for widgets application Generated code uses some C++11 features which cannot get easily enabled when using Qt4. Instead of adding several lines for correctly handling this on all platforms just drop the wizard support. Change-Id: If0e748283cfdddbefd3c27e3c9f4316c0ce7efe3 Reviewed-by: Eike Ziller Reviewed-by: Alessandro Portale --- src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp | 3 ++- src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp index 00f32d47db1..227575558ed 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp @@ -78,7 +78,8 @@ 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"))); - setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS}); + auto qt5 = Core::Id::fromString(QString(QtSupport::Constants::FEATURE_QT_PREFIX).append(".5")); + setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS, qt5}); } 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 5f12fdc41a0..0bdf1a3a7de 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp @@ -84,6 +84,7 @@ QtProjectParameters GuiAppWizardDialog::projectParameters() const rc.path = path(); rc.selectedModules = selectedModulesList(); rc.deselectedModules = deselectedModulesList(); + rc.qtVersionSupport = QtProjectParameters::SupportQt5Only; return rc; }