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

Profile -> Kit variable renaming

Browse Source 
Change-Id: I6cc06684134030bd527d9dcce21ad17938a56927
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-09-09 20:41:30 +03:00
committed by Orgad Shaneh
parent 5aef98bb66
commit 4ef2fbd4ce
33 changed files with 205 additions and 205 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;
}
@@ -1392,34 +1392,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) {