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

Qt4Projectmanager: Do not crash on importing projects without builds

Browse Source
This commit is contained in:
dt
2011-02-22 20:01:19 +01:00
parent 431d83465a
commit 0609b5b85d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -739,7 +739,9 @@ QList<BuildConfigurationInfo> BuildConfigurationInfo::importBuildConfigurations(
// Check for in source build first // Check for in source build first
QString sourceDir = QFileInfo(proFilePath).absolutePath(); QString sourceDir = QFileInfo(proFilePath).absolutePath();
result.append(checkForBuild(sourceDir, proFilePath)); BuildConfigurationInfo info = checkForBuild(sourceDir, proFilePath);
if (info.isValid())
result.append(info);
// If we found a in source build, we do not search for out of source builds // If we found a in source build, we do not search for out of source builds
if (!result.isEmpty()) if (!result.isEmpty())
@@ -752,7 +754,9 @@ QList<BuildConfigurationInfo> BuildConfigurationInfo::importBuildConfigurations(
foreach (Qt4BaseTargetFactory *factory, factories) { foreach (Qt4BaseTargetFactory *factory, factories) {
foreach (const QString &id, factory->supportedTargetIds(0)) { foreach (const QString &id, factory->supportedTargetIds(0)) {
QString expectedBuild = factory->defaultShadowBuildDirectory(defaultTopLevelBuildDirectory, id); QString expectedBuild = factory->defaultShadowBuildDirectory(defaultTopLevelBuildDirectory, id);
result.append(checkForBuild(expectedBuild, proFilePath)); BuildConfigurationInfo info = checkForBuild(expectedBuild, proFilePath);
if (info.isValid())
result.append(info);
} }
} }
return result; return result;