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

Merge remote-tracking branch 'gerrit/2.6'

Browse Source 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
This commit is contained in:
Oswald Buddenhagen
2012-09-12 17:27:37 +02:00
parent c12cefbb51 77a6b71f72
commit e730e2bb8a
93 changed files with 880 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -864,9 +864,9 @@ Qt4Manager *Qt4Project::qt4ProjectManager() const
return m_manager;
}
bool Qt4Project::supportsKit(Kit *p) const
bool Qt4Project::supportsKit(Kit *k) const
{
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(p);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k);
return version;
}
@@ -1390,34 +1390,34 @@ QString Qt4Project::disabledReasonForRunConfiguration(const QString &proFilePath
.arg(QFileInfo(proFilePath).fileName());
}
QString Qt4Project::shadowBuildDirectory(const QString &profilePath, const Kit *p, const QString &suffix)
QString Qt4Project::shadowBuildDirectory(const QString &profilePath, const Kit *k, const QString &suffix)
{
if (profilePath.isEmpty())
return QString();
QFileInfo info(profilePath);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(p);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k);
if (version && !version->supportsShadowBuilds())
return info.absolutePath();
QString base = QDir::cleanPath(projectDirectory(profilePath) + QLatin1String("/../")
+ info.baseName() + QLatin1String("-build-"));
return base + buildNameFor(p) + QLatin1String("-") + sanitize(suffix);
return base + buildNameFor(k) + QLatin1String("-") + sanitize(suffix);
}
QString Qt4Project::buildNameFor(const Kit *p)
QString Qt4Project::buildNameFor(const Kit *k)
{
if (!p)
if (!k)
return QLatin1String("unknown");
return QString::fromLatin1(p->id().name()).mid(31, 6); // part of the UUID, should be pretty unique;-)
return QString::fromLatin1(k->id().name()).mid(31, 6); // part of the UUID, should be pretty unique;-)
}
Target *Qt4Project::createTarget(Kit *p, const QList<BuildConfigurationInfo> &infoList)
Target *Qt4Project::createTarget(Kit *k, const QList<BuildConfigurationInfo> &infoList)
{
if (target(p))
if (target(k))
return 0;
Target *t = new Target(this, p);
Target *t = new Target(this, k);
// Build Configurations:
foreach (const BuildConfigurationInfo &info, infoList) {