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

Merge remote-tracking branch 'origin/10.0' into qds/dev

Browse Source 
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
This commit is contained in:
Tim Jenßen
2023-03-26 15:58:49 +02:00
parent 359ea5d55a f7639f458a
commit feabda3aa7
8349 changed files with 128327 additions and 169799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "qtversionmanager.h"
@@ -127,8 +127,7 @@ void QtVersionManager::triggerQtVersionRestore()
m_configFileWatcher = new FileSystemWatcher(m_instance);
connect(m_configFileWatcher, &FileSystemWatcher::fileChanged,
m_fileWatcherTimer, QOverload<>::of(&QTimer::start));
m_configFileWatcher->addFile(configFileName.toString(),
FileSystemWatcher::WatchModifiedDate);
m_configFileWatcher->addFile(configFileName, FileSystemWatcher::WatchModifiedDate);
} // exists
const QtVersions vs = versions();
@@ -226,8 +225,8 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
const FilePath path = globalSettingsFileName();
// Handle overwritting of data:
if (m_configFileWatcher) {
m_configFileWatcher->removeFile(path.toString());
m_configFileWatcher->addFile(path.toString(), FileSystemWatcher::WatchModifiedDate);
m_configFileWatcher->removeFile(path);
m_configFileWatcher->addFile(path, FileSystemWatcher::WatchModifiedDate);
}
QList<int> added;
@@ -375,7 +374,7 @@ static QList<QByteArray> runQtChooser(const QString &qtchooser, const QStringLis
p.start();
p.waitForFinished();
const bool success = p.exitCode() == 0;
return success ? p.readAllStandardOutput().split('\n') : QList<QByteArray>();
return success ? p.readAllRawStandardOutput().split('\n') : QList<QByteArray>();
}
// Asks qtchooser for the qmake path of a given version
@@ -421,8 +420,7 @@ static void findSystemQt()
if (BuildableHelperLibrary::isQtChooser(qmakePath))
continue;
const auto isSameQmake = [qmakePath](const QtVersion *version) {
return Environment::systemEnvironment().
isSameExecutable(qmakePath.toString(), version->qmakeFilePath().toString());
return qmakePath.isSameExecutable(version->qmakeFilePath());
};
if (contains(m_versions, isSameQmake))
continue;