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

TargetSetupPage: Only offer qt versions that have a toolchain

Browse Source 
Task-Nr: QTCREATORBUG-3886
This commit is contained in:
dt
2011-03-10 17:55:02 +01:00
parent 11311b6e94
commit ac28279efe
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,7 +136,7 @@ QList<BuildConfigurationInfo> Qt4DesktopTargetFactory::availableBuildConfigurati
QList<QtVersion *> knownVersions = QtVersionManager::instance()->versionsForTargetId(id, minimumQtVersion);
foreach (QtVersion *version, knownVersions) {
if (!version->isValid())
if (!version->isValid() || !version->toolChainAvailable())
continue;
QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();

2
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
View File

@@ -136,7 +136,7 @@ QList<BuildConfigurationInfo> Qt4SimulatorTargetFactory::availableBuildConfigura
QList<QtVersion *> knownVersions = QtVersionManager::instance()->versionsForTargetId(id, minimumQtVersion);
foreach (QtVersion *version, knownVersions) {
if (!version->isValid())
if (!version->isValid() || !version->toolChainAvailable())
continue;
QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id);

2
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
View File

@@ -156,7 +156,7 @@ QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfiguration
QList<QtVersion *> knownVersions = QtVersionManager::instance()->versionsForTargetId(id, minimumQtVersion);
foreach (QtVersion *version, knownVersions) {
if (!version->isValid())
if (!version->isValid() || !version->toolChainAvailable())
continue;
QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id);

4
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
View File

@@ -45,6 +45,7 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/toolchainmanager.h>
using ProjectExplorer::idFromMap;
using namespace Qt4ProjectManager;
@@ -139,8 +140,9 @@ QList<BuildConfigurationInfo> Qt4SymbianTargetFactory::availableBuildConfigurati
QList<QtVersion *> knownVersions = QtVersionManager::instance()->versionsForTargetId(id, minimumQtVersion);
foreach (QtVersion *version, knownVersions) {
if (!version->isValid())
if (!version->isValid() || !version->toolChainAvailable())
continue;
bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll;
QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0);
QString dir = QFileInfo(proFilePath).absolutePath(), id;

16
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -254,10 +254,10 @@ void QtVersionManager::removeVersion(QtVersion *version)
bool QtVersionManager::supportsTargetId(const QString &id) const
{
foreach (QtVersion *version, m_versions) {
if (version->supportsTargetId(id))
QList<QtVersion *> versions = QtVersionManager::instance()->versionsForTargetId(id);
foreach (QtVersion *v, versions)
if (v->isValid() && v->toolChainAvailable())
return true;
}
return false;
}
@@ -1750,6 +1750,16 @@ bool QtVersion::isValid() const
&& !m_abis.isEmpty();
}
bool QtVersion::toolChainAvailable() const
{
if (!isValid())
return false;
foreach (const ProjectExplorer::Abi &abi, qtAbis())
if (!ProjectExplorer::ToolChainManager::instance()->findToolChains(abi).isEmpty())
return true;
return false;
}
QString QtVersion::invalidReason() const
{
if (isValid())

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

@@ -95,7 +95,8 @@ public:
QtVersion();
~QtVersion();
bool isValid() const; //TOOD check that the dir exists and the name is non empty
bool isValid() const;
bool toolChainAvailable() const;
QString invalidReason() const;
QString description() const;
bool isAutodetected() const { return m_isAutodetected; }