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

2
src/plugins/mesonprojectmanager/kithelper/kitdata.h
View File

@@ -39,7 +39,7 @@ struct KitData
QString cmakePath;
QString qmakePath;
QString qtVersionStr;
Utils::QtVersion qtVersion;
Utils::QtMajorVersion qtVersion;
};
} // namespace Internal

10
src/plugins/mesonprojectmanager/kithelper/kithelper.h
View File

@@ -84,21 +84,21 @@ inline KitData kitData(const ProjectExplorer::Kit *kit)
data.cmakePath = cmakePath(kit);
data.qmakePath = qmakePath(kit);
data.qtVersionStr = qtVersion(kit);
data.qtVersion = Utils::QtVersion::None;
data.qtVersion = Utils::QtMajorVersion::None;
auto version = Version::fromString(data.qtVersionStr);
if (version.isValid) {
switch (version.major) {
case 4:
data.qtVersion = Utils::QtVersion::Qt4;
data.qtVersion = Utils::QtMajorVersion::Qt4;
break;
case 5:
data.qtVersion = Utils::QtVersion::Qt5;
data.qtVersion = Utils::QtMajorVersion::Qt5;
break;
case 6:
data.qtVersion = Utils::QtVersion::Qt6;
data.qtVersion = Utils::QtMajorVersion::Qt6;
break;
default:
data.qtVersion = Utils::QtVersion::Unknown;
data.qtVersion = Utils::QtMajorVersion::Unknown;
}
}
return data;

6
src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp
View File

@@ -51,11 +51,11 @@ void writeBinariesSection(QIODevice *nativeFile, const KitData &kitData)
addEntry(nativeFile, "c", kitData.cCompilerPath);
addEntry(nativeFile, "cpp", kitData.cxxCompilerPath);
addEntry(nativeFile, "qmake", kitData.qmakePath);
if (kitData.qtVersion == Utils::QtVersion::Qt4)
if (kitData.qtVersion == Utils::QtMajorVersion::Qt4)
addEntry(nativeFile, QString{"qmake-qt4"}, kitData.qmakePath);
else if (kitData.qtVersion == Utils::QtVersion::Qt5)
else if (kitData.qtVersion == Utils::QtMajorVersion::Qt5)
addEntry(nativeFile, QString{"qmake-qt5"}, kitData.qmakePath);
else if (kitData.qtVersion == Utils::QtVersion::Qt6)
else if (kitData.qtVersion == Utils::QtMajorVersion::Qt6)
addEntry(nativeFile, QString{"qmake-qt6"}, kitData.qmakePath);
addEntry(nativeFile, "cmake", kitData.cmakePath);
}

4
src/plugins/mesonprojectmanager/project/mesonprojectparser.h
View File

@@ -96,7 +96,7 @@ public:
inline void setEnvironment(const Utils::Environment &environment) { m_env = environment; }
inline void setQtVersion(Utils::QtVersion v) { m_qtVersion = v; }
inline void setQtVersion(Utils::QtMajorVersion v) { m_qtVersion = v; }
bool matchesKit(const KitData &kit);
@@ -124,7 +124,7 @@ private:
IntroDataType m_introType;
MesonInfoParser::Result m_parserResult;
QStringList m_targetsNames;
Utils::QtVersion m_qtVersion = Utils::QtVersion::Unknown;
Utils::QtMajorVersion m_qtVersion = Utils::QtMajorVersion::Unknown;
std::unique_ptr<MesonProjectNode> m_rootNode; // <- project tree root node
QString m_projectName;
// maybe moving meson to build step could make this class simpler