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

Qt4ProjectManager: Small refactoring in reportIssues

Browse Source 
Do not report project dir specific issues next to each
buildconfiguration. Also move the code to a place the TargetSetupPage
can easily use, without having a hardcoded target list. Note: They
currently aren't shown at all, next step is to show them once per
target.

Reviewed-By: hunger
This commit is contained in:
dt
2011-03-11 15:58:33 +01:00
parent ffc8be6c88
commit 8a180f71df
12 changed files with 83 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,11 +40,11 @@
#include "qt-maemo/maemoglobal.h"
#include "qt-maemo/maemomanager.h"
#include "qt-s60/s60manager.h"
#include "qt-s60/s60projectchecker.h"
#include "qt-s60/abldparser.h"
#include "qt-s60/sbsv2parser.h"
#include "qt-s60/gccetoolchain.h"
#include "qt-s60/winscwtoolchain.h"
#include "qt4basetargetfactory.h"
#include "qmlobservertool.h"
#include "qmldumptool.h"
@@ -85,6 +85,8 @@
#include <QtGui/QApplication>
#include <QtGui/QDesktopServices>
#include <algorithm>
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
@@ -766,7 +768,7 @@ ProjectExplorer::IOutputParser *QtVersion::createOutputParser() const
}
QList<ProjectExplorer::Task>
QtVersion::reportIssues(const QString &proFile, const QString &buildDir)
QtVersion::reportIssues(const QString &proFile, const QString &buildDir, bool includeTargetSpecificErrors)
{
QList<ProjectExplorer::Task> results;
@@ -807,10 +809,33 @@ QtVersion::reportIssues(const QString &proFile, const QString &buildDir)
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
}
#if defined (Q_OS_WIN)
QSet<QString> targets = supportedTargetIds();
if (targets.contains(Constants::S60_DEVICE_TARGET_ID) ||
targets.contains(Constants::S60_EMULATOR_TARGET_ID))
results.append(S60ProjectChecker::reportIssues(proFile));
targets.contains(Constants::S60_EMULATOR_TARGET_ID)) {
const QString epocRootDir = systemRoot();
// Report an error if project- and epoc directory are on different drives:
if (!epocRootDir.startsWith(proFile.left(3), Qt::CaseInsensitive) && !isBuildWithSymbianSbsV2()) {
results.append(ProjectExplorer::Task(ProjectExplorer::Task::Error,
QCoreApplication::translate("ProjectExplorer::Internal::S60ProjectChecker",
"The Symbian SDK and the project sources must reside on the same drive."),
QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
}
#endif
if (includeTargetSpecificErrors) {
QList<Qt4BaseTargetFactory *> factories;
foreach (const QString &id, supportedTargetIds())
if (Qt4BaseTargetFactory *factory = Qt4BaseTargetFactory::qt4BaseTargetFactoryForId(id))
factories << factory;
qSort(factories);
QList<Qt4BaseTargetFactory *>::iterator newend = std::unique(factories.begin(), factories.end());
QList<Qt4BaseTargetFactory *>::iterator it = factories.begin();
for ( ; it != newend; ++it)
results.append((*it)->reportIssues(proFile));
}
return results;
}