feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Wizards: Drop support for Qt4 for widgets application"

Browse Source 
This reverts commit 1a6522b47c
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>
This commit is contained in:
hjk
2018-07-26 13:05:21 +02:00
parent 8e8598f2a3
commit 5787ecb025
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
View File

@@ -78,8 +78,7 @@ GuiAppWizard::GuiAppWizard()
"Includes a Qt Designer-based main window.\n\n" "Includes a Qt Designer-based main window.\n\n"
"Preselects a desktop Qt for building the application if available.")); "Preselects a desktop Qt for building the application if available."));
setIcon(QIcon(QLatin1String(":/wizards/images/gui.png"))); 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});
setRequiredFeatures({QtSupport::Constants::FEATURE_QWIDGETS, qt5});
} }
Core::BaseFileWizard *GuiAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const Core::BaseFileWizard *GuiAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const

1
src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
View File

@@ -84,7 +84,6 @@ QtProjectParameters GuiAppWizardDialog::projectParameters() const
rc.path = path(); rc.path = path();
rc.selectedModules = selectedModulesList(); rc.selectedModules = selectedModulesList();
rc.deselectedModules = deselectedModulesList(); rc.deselectedModules = deselectedModulesList();
rc.qtVersionSupport = QtProjectParameters::SupportQt5Only;
return rc; return rc;
} }