forked from qt-creator/qt-creator
Fix minimum qt version for mobile/html wizard
That was broken by the TargetSetupPage refactoring Task-Nr: QTCREATORBUG-4486 Reviewed-By: ck
This commit is contained in:
@@ -49,12 +49,12 @@
|
|||||||
|
|
||||||
namespace Qt4ProjectManager {
|
namespace Qt4ProjectManager {
|
||||||
|
|
||||||
AbstractMobileAppWizardDialog::AbstractMobileAppWizardDialog(QWidget *parent)
|
AbstractMobileAppWizardDialog::AbstractMobileAppWizardDialog(QWidget *parent, const QtVersionNumber &minimumQtVersionNumber)
|
||||||
: ProjectExplorer::BaseProjectWizardDialog(parent)
|
: ProjectExplorer::BaseProjectWizardDialog(parent)
|
||||||
{
|
{
|
||||||
m_targetsPage = new TargetSetupPage;
|
m_targetsPage = new TargetSetupPage;
|
||||||
m_targetsPage->setPreferMobile(true);
|
m_targetsPage->setPreferMobile(true);
|
||||||
m_targetsPage->setMinimumQtVersion(QtVersionNumber(4,7,0));
|
m_targetsPage->setMinimumQtVersion(minimumQtVersionNumber);
|
||||||
resize(900, 450);
|
resize(900, 450);
|
||||||
m_targetsPageId = addPageWithTitle(m_targetsPage, tr("Qt Versions"));
|
m_targetsPageId = addPageWithTitle(m_targetsPage, tr("Qt Versions"));
|
||||||
m_genericOptionsPage = new Internal::MobileAppWizardGenericOptionsPage;
|
m_genericOptionsPage = new Internal::MobileAppWizardGenericOptionsPage;
|
||||||
|
@@ -35,6 +35,7 @@
|
|||||||
#define ABSTRACTMOBILEAPPWIZARD_H
|
#define ABSTRACTMOBILEAPPWIZARD_H
|
||||||
|
|
||||||
#include <qt4projectmanager/qt4projectmanager_global.h>
|
#include <qt4projectmanager/qt4projectmanager_global.h>
|
||||||
|
#include <qt4projectmanager/qtversionmanager.h>
|
||||||
#include <coreplugin/basefilewizard.h>
|
#include <coreplugin/basefilewizard.h>
|
||||||
#include <projectexplorer/baseprojectwizarddialog.h>
|
#include <projectexplorer/baseprojectwizarddialog.h>
|
||||||
|
|
||||||
@@ -55,7 +56,7 @@ class QT4PROJECTMANAGER_EXPORT AbstractMobileAppWizardDialog : public ProjectExp
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
explicit AbstractMobileAppWizardDialog(QWidget *parent = 0);
|
explicit AbstractMobileAppWizardDialog(QWidget *parent, const QtVersionNumber &minimumQtVersionNumber);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TargetSetupPage *targetsPage() const;
|
TargetSetupPage *targetsPage() const;
|
||||||
|
@@ -59,7 +59,7 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
Html5AppWizardDialog::Html5AppWizardDialog(QWidget *parent)
|
Html5AppWizardDialog::Html5AppWizardDialog(QWidget *parent)
|
||||||
: AbstractMobileAppWizardDialog(parent)
|
: AbstractMobileAppWizardDialog(parent, QtVersionNumber())
|
||||||
, m_htmlOptionsPage(0)
|
, m_htmlOptionsPage(0)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("New HTML5 Application"));
|
setWindowTitle(tr("New HTML5 Application"));
|
||||||
|
@@ -61,7 +61,7 @@ class MobileAppWizardDialog : public AbstractMobileAppWizardDialog
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit MobileAppWizardDialog(QWidget *parent = 0)
|
explicit MobileAppWizardDialog(QWidget *parent = 0)
|
||||||
: AbstractMobileAppWizardDialog(parent)
|
: AbstractMobileAppWizardDialog(parent, QtVersionNumber())
|
||||||
{
|
{
|
||||||
setWindowTitle(DisplayName);
|
setWindowTitle(DisplayName);
|
||||||
setIntroDescription(Description);
|
setIntroDescription(Description);
|
||||||
|
@@ -59,7 +59,7 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent)
|
QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent)
|
||||||
: AbstractMobileAppWizardDialog(parent)
|
: AbstractMobileAppWizardDialog(parent, QtVersionNumber(4, 7, 1))
|
||||||
, m_qmlSourcesPage(0)
|
, m_qmlSourcesPage(0)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("New Qt Quick Application"));
|
setWindowTitle(tr("New Qt Quick Application"));
|
||||||
|
Reference in New Issue
Block a user