Skip to content
Snippets Groups Projects
Commit ceb9319e authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Offer to import builds not done by this Qt Creator instance


Change-Id: I7dd8d3b8ae919808fd7089079dcd5583ebc89913
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent cd807f97
No related branches found
No related tags found
No related merge requests found
......@@ -511,20 +511,25 @@ void TargetSetupPage::setupImports()
if (!m_importSearch || m_proFilePath.isEmpty())
return;
QString sourceDir = QFileInfo(m_proFilePath).absolutePath();
import(Utils::FileName::fromString(sourceDir), true);
QFileInfo pfi(m_proFilePath);
const QString prefix = pfi.baseName();
QStringList toImport;
toImport << pfi.absolutePath();
QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::instance()->kits();
foreach (ProjectExplorer::Kit *k, kitList) {
QFileInfo fi(Qt4Project::shadowBuildDirectory(m_proFilePath, k, QString()));
const QString baseDir = fi.absolutePath();
const QString prefix = fi.baseName();
foreach (const QString &dir, QDir(baseDir).entryList()) {
if (dir.startsWith(prefix))
import(Utils::FileName::fromString(baseDir + QLatin1Char('/') + dir), true);
const QString path = baseDir + QLatin1Char('/') + dir;
if (dir.startsWith(prefix) && !toImport.contains(path))
toImport << path;
}
}
foreach (const QString &path, toImport)
import(Utils::FileName::fromString(path), true);
}
void TargetSetupPage::handleKitAddition(ProjectExplorer::Kit *k)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment