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

ProjectImporter: Clean up APIs, move more code into Base class

Browse Source 
Change-Id: Ida7aae846888efb3c9da456a83db5a90256bf7d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-24 15:20:28 +02:00
parent d5cdbf8baf
commit 52326f1e82
5 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -250,16 +250,16 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
return result;
}
QStringList QmakeProjectImporter::importCandidates(const FileName &projectPath)
QStringList QmakeProjectImporter::importCandidates()
{
QStringList candidates;
QFileInfo pfi = projectPath.toFileInfo();
QFileInfo pfi = QFileInfo(projectFilePath());
const QString prefix = pfi.baseName();
candidates << pfi.absolutePath();
foreach (Kit *k, KitManager::kits()) {
QFileInfo fi(QmakeBuildConfiguration::shadowBuildDirectory(projectPath.toString(), k,
QFileInfo fi(QmakeBuildConfiguration::shadowBuildDirectory(projectFilePath(), k,
QString(), BuildConfiguration::Unknown));
const QString baseDir = fi.absolutePath();
@@ -355,31 +355,17 @@ Kit *QmakeProjectImporter::createTemporaryKit(BaseQtVersion *version,
const QMakeStepConfig::OsType &osType)
{
Q_UNUSED(osType); // TODO use this to select the right toolchain?
Kit *k = new Kit;
UpdateGuard guard(*this);
{
KitGuard kitGuard(k);
return createTemporaryKit([version, temporaryVersion, parsedSpec, archConfig](Kit *k) -> void {
QtKitInformation::setQtVersion(k, version);
ToolChainKitInformation::setToolChain(k, preferredToolChain(version, parsedSpec, archConfig));
if (parsedSpec != version->mkspec())
QmakeKitInformation::setMkspec(k, parsedSpec);
markTemporary(k);
if (temporaryVersion)
k->setValue(QT_IS_TEMPORARY, version->uniqueId());
// Set up other values:
foreach (KitInformation *ki, KitManager::kitInformation()) {
if (ki->id() == ToolChainKitInformation::id() || ki->id() == QtKitInformation::id())
continue;
ki->setup(k);
}
k->setUnexpandedDisplayName(version->displayName());;
} // ~KitGuard, sending kitUpdated
KitManager::registerKit(k); // potentially adds kits to other targetsetuppages
return k;
});
}
} // namespace Internal