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

Do not create a widget if no valid qt version was found

Browse Source
This commit is contained in:
dt
2011-02-24 12:33:01 +01:00
parent e247aec8b9
commit a552bc8b25
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
View File

@@ -148,8 +148,13 @@ QList<BuildConfigurationInfo> Qt4DesktopTargetFactory::availableBuildConfigurati
Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const QString &id, const QString &proFilePath, const QtVersionNumber &number, bool importEnabled, QList<BuildConfigurationInfo> importInfos) Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const QString &id, const QString &proFilePath, const QtVersionNumber &number, bool importEnabled, QList<BuildConfigurationInfo> importInfos)
{ {
Qt4DefaultTargetSetupWidget *widget = new Qt4DefaultTargetSetupWidget(this, id, proFilePath, number, importEnabled, importInfos); Qt4DefaultTargetSetupWidget *widget
widget->setShadowBuildCheckBoxVisible(true); = static_cast<Qt4DefaultTargetSetupWidget *>(
Qt4BaseTargetFactory::createTargetSetupWidget(id, proFilePath,
number, importEnabled,
importInfos));
if (widget)
widget->setShadowBuildCheckBoxVisible(true);
return widget; return widget;
} }

10
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -79,7 +79,10 @@ Qt4TargetSetupWidget *Qt4BaseTargetFactory::createTargetSetupWidget(const QStrin
bool importEnabled, bool importEnabled,
QList<BuildConfigurationInfo> importInfos) QList<BuildConfigurationInfo> importInfos)
{ {
return new Qt4DefaultTargetSetupWidget(this, id, proFilePath, number, importEnabled, importInfos); QList<BuildConfigurationInfo> infos = this->availableBuildConfigurations(id, proFilePath, number);
if (infos.isEmpty())
return 0;
return new Qt4DefaultTargetSetupWidget(this, id, proFilePath, infos, number, importEnabled, importInfos);
} }
Qt4BaseTarget *Qt4BaseTargetFactory::create(ProjectExplorer::Project *parent, const QString &id, Qt4TargetSetupWidget *widget) Qt4BaseTarget *Qt4BaseTargetFactory::create(ProjectExplorer::Project *parent, const QString &id, Qt4TargetSetupWidget *widget)
@@ -279,9 +282,10 @@ Qt4TargetSetupWidget::~Qt4TargetSetupWidget()
Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *factory, Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *factory,
const QString &id, const QString &id,
const QString &proFilePath, const QString &proFilePath,
const QList<BuildConfigurationInfo> &infos,
const QtVersionNumber &minimumQtVersion, const QtVersionNumber &minimumQtVersion,
bool importEnabled, bool importEnabled,
QList<BuildConfigurationInfo> importInfos) const QList<BuildConfigurationInfo> &importInfos)
: Qt4TargetSetupWidget(), : Qt4TargetSetupWidget(),
m_id(id), m_id(id),
m_factory(factory), m_factory(factory),
@@ -370,7 +374,7 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f
setupImportWidgets(); setupImportWidgets();
setBuildConfigurationInfos(factory->availableBuildConfigurations(id, proFilePath, minimumQtVersion)); setBuildConfigurationInfos(infos);
if (!m_importInfos.isEmpty()) if (!m_importInfos.isEmpty())
m_detailsWidget->setState(Utils::DetailsWidget::Expanded); m_detailsWidget->setState(Utils::DetailsWidget::Expanded);

3
src/plugins/qt4projectmanager/qt4target.h
View File

@@ -185,9 +185,10 @@ public:
Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *factory, Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *factory,
const QString &id, const QString &id,
const QString &proFilePath, const QString &proFilePath,
const QList<BuildConfigurationInfo> &info,
const QtVersionNumber &minimumQtVersion, const QtVersionNumber &minimumQtVersion,
bool importEnabled, bool importEnabled,
QList<BuildConfigurationInfo> importInfos); const QList<BuildConfigurationInfo> &importInfos);
~Qt4DefaultTargetSetupWidget(); ~Qt4DefaultTargetSetupWidget();
bool isTargetSelected() const; bool isTargetSelected() const;
void setTargetSelected(bool b); void setTargetSelected(bool b);