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

Docker: Be a bit more flexible when searching Qt versions

Browse Source 
Change-Id: I8611a0ad05cbbca79589f1defc8c1ed1399615e1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-06-18 17:32:21 +02:00
parent ada39349a2
commit faf1296345
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/docker/dockerdevice.cpp
View File

@@ -257,7 +257,7 @@ public:
void autoDetect(QTextBrowser *log);
void undoAutoDetect(QTextBrowser *log) const;
BaseQtVersion *autoDetectQtVersion(QTextBrowser *log) const;
QList<BaseQtVersion *> autoDetectQtVersions(QTextBrowser *log) const;
QList<ToolChain *> autoDetectToolChains(QTextBrowser *log);
void autoDetectCMake(QTextBrowser *log);
@@ -423,24 +423,34 @@ void DockerDevicePrivate::undoAutoDetect(QTextBrowser *log) const
// };
if (log)
log->append(tr("Removal of auto-detected kit items finished."));
log->append(tr("Removal of previously auto-detected kit items finished.") + '\n');
}
BaseQtVersion *DockerDevicePrivate::autoDetectQtVersion(QTextBrowser *log) const
QList<BaseQtVersion *> DockerDevicePrivate::autoDetectQtVersions(QTextBrowser *log) const
{
QList<BaseQtVersion *> qtVersions;
QString error;
const QStringList candidates = {"/usr/local/bin/qmake", "/usr/bin/qmake"};
log->append('\n' + tr("Searching Qt installation..."));
const QStringList candidates = {"qmake-qt6", "qmake-qt5", "qmake"};
if (log)
log->append('\n' + tr("Searching Qt installations..."));
for (const QString &candidate : candidates) {
const FilePath qmake = q->mapToGlobalPath(FilePath::fromString(candidate));
if (auto qtVersion = QtVersionFactory::createQtVersionFromQMakePath(qmake, false, m_data.id(), &error)) {
QtVersionManager::addVersion(qtVersion);
if (log)
log->append(tr("Searching for %1 executable...").arg(candidate));
const FilePath qmake = q->searchInPath(FilePath::fromString(candidate));
if (qmake.isEmpty())
continue;
BaseQtVersion *qtVersion = QtVersionFactory::createQtVersionFromQMakePath(qmake, false, m_data.id(), &error);
if (!qtVersion)
continue;
qtVersions.append(qtVersion);
QtVersionManager::addVersion(qtVersion);
if (log)
log->append(tr("Found Qt: %1").arg(qtVersion->qmakeCommand().toUserOutput()));
return qtVersion;
}
}
log->append(tr("No Qt installation found."));
return nullptr;
if (qtVersions.isEmpty() && log)
log->append(tr("No Qt installation found."));
return qtVersions;
}
QList<ToolChain *> DockerDevicePrivate::autoDetectToolChains(QTextBrowser *log)
@@ -498,11 +508,11 @@ void DockerDevicePrivate::autoDetect(QTextBrowser *log)
log->append(tr("Starting auto-detection. This will take a while..."));
QList<ToolChain *> toolChains = autoDetectToolChains(log);
BaseQtVersion *qt = autoDetectQtVersion(log);
QList<BaseQtVersion *> qtVersions = autoDetectQtVersions(log);
autoDetectCMake(log);
const auto initializeKit = [this, toolChains, qt](Kit *k) {
const auto initializeKit = [this, toolChains, qtVersions](Kit *k) {
k->setAutoDetected(false);
k->setAutoDetectionSource(m_data.id());
k->setUnexpandedDisplayName("%{Device:Name}");
@@ -511,7 +521,8 @@ void DockerDevicePrivate::autoDetect(QTextBrowser *log)
DeviceKitAspect::setDevice(k, q->sharedFromThis());
for (ToolChain *tc : toolChains)
ToolChainKitAspect::setToolChain(k, tc);
QtSupport::QtKitAspect::setQtVersion(k, qt);
if (!qtVersions.isEmpty())
QtSupport::QtKitAspect::setQtVersion(k, qtVersions.at(0));
k->setSticky(ToolChainKitAspect::id(), true);
k->setSticky(QtSupport::QtKitAspect::id(), true);
@@ -520,7 +531,8 @@ void DockerDevicePrivate::autoDetect(QTextBrowser *log)
};
Kit *kit = KitManager::registerKit(initializeKit);
log->append('\n' + tr("Registered Kit %1").arg(kit->displayName()));
if (log)
log->append('\n' + tr("Registered Kit %1").arg(kit->displayName()));
QApplication::restoreOverrideCursor();
}
@@ -867,7 +879,7 @@ FilePath DockerDevice::searchInPath(const FilePath &filePath) const
LOG("Run sync:" << dcmd.toUserOutput() << " result: " << proc.exitCode());
QTC_ASSERT(proc.exitCode() == 0, return filePath);
const QString output = proc.stdOut();
const QString output = proc.stdOut().trimmed();
return mapToGlobalPath(FilePath::fromString(output));
}