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

baseqtversion: commands are FilePathes

Browse Source 
also renamed the qmlscene* qmlRuntime*

Change-Id: Ifd522e21f5ce30aaa54060fdcebee2cd8b9463c4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2021-07-13 09:41:26 +02:00
parent a4c05f585f
commit 22121885fe
21 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -265,7 +265,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
if (log().isDebugEnabled()) {
qCDebug(log) << "======= Existing Qt versions =======";
for (BaseQtVersion *version : qAsConst(m_versions)) {
qCDebug(log) << version->qmakeCommand().toString() << "id:"<<version->uniqueId();
qCDebug(log) << version->qmakeFilePath().toString() << "id:"<<version->uniqueId();
qCDebug(log) << " autodetection source:"<< version->autodetectionSource();
qCDebug(log) << "";
}
@@ -341,7 +341,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
if (log().isDebugEnabled()) {
qCDebug(log) << "======= Before removing outdated sdk versions =======";
for (BaseQtVersion *version : qAsConst(m_versions)) {
qCDebug(log) << version->qmakeCommand().toString() << "id:"<<version->uniqueId();
qCDebug(log) << version->qmakeFilePath().toString() << "id:"<<version->uniqueId();
qCDebug(log) << " autodetection source:"<< version->autodetectionSource();
qCDebug(log) << "";
}
@@ -360,7 +360,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
if (log().isDebugEnabled()) {
qCDebug(log)<< "======= End result =======";
for (BaseQtVersion *version : qAsConst(m_versions)) {
qCDebug(log) << version->qmakeCommand().toString() << "id:" << version->uniqueId();
qCDebug(log) << version->qmakeFilePath().toString() << "id:" << version->uniqueId();
qCDebug(log) << " autodetection source:"<< version->autodetectionSource();
qCDebug(log) << "";
}
@@ -443,7 +443,7 @@ static void findSystemQt()
continue;
const auto isSameQmake = [qmakePath](const BaseQtVersion *version) {
return Environment::systemEnvironment().
isSameExecutable(qmakePath.toString(), version->qmakeCommand().toString());
isSameExecutable(qmakePath.toString(), version->qmakeFilePath().toString());
};
if (contains(m_versions, isSameQmake))
continue;