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

Rename QtSupport::BaseQtVersion to QtVersion

Browse Source 
... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.

Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-01-21 16:06:36 +01:00
parent 6cec0e2033
commit 25f5771aa4
113 changed files with 636 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/externaleditors.cpp
View File

@@ -61,14 +61,14 @@ static inline QString msgAppNotFound(const QString &id)
}
// -- Commands and helpers
static QString linguistBinary(const QtSupport::BaseQtVersion *qtVersion)
static QString linguistBinary(const QtSupport::QtVersion *qtVersion)
{
if (qtVersion)
return qtVersion->linguistFilePath().toString();
return QLatin1String(Utils::HostOsInfo::isMacHost() ? "Linguist" : "linguist");
}
static QString designerBinary(const QtSupport::BaseQtVersion *qtVersion)
static QString designerBinary(const QtSupport::QtVersion *qtVersion)
{
if (qtVersion)
return qtVersion->designerFilePath().toString();
@@ -127,10 +127,10 @@ ExternalQtEditor *ExternalQtEditor::createDesignerEditor()
}
}
static QString findFirstCommand(QVector<QtSupport::BaseQtVersion *> qtVersions,
static QString findFirstCommand(QVector<QtSupport::QtVersion *> qtVersions,
ExternalQtEditor::CommandForQtVersion command)
{
foreach (QtSupport::BaseQtVersion *qt, qtVersions) {
foreach (QtSupport::QtVersion *qt, qtVersions) {
if (qt) {
const QString binary = command(qt);
if (!binary.isEmpty())
@@ -151,7 +151,7 @@ bool ExternalQtEditor::getEditorLaunchData(const Utils::FilePath &filePath,
// - any other kit
// As fallback check PATH
data->workingDirectory.clear();
QVector<QtSupport::BaseQtVersion *> qtVersionsToCheck; // deduplicated after being filled
QVector<QtSupport::QtVersion *> qtVersionsToCheck; // deduplicated after being filled
if (const Project *project = SessionManager::projectForFile(filePath)) {
data->workingDirectory = project->projectDirectory();
// active kit