diff options
| author | hjk <[email protected]> | 2022-01-21 16:06:36 +0100 |
|---|---|---|
| committer | hjk <[email protected]> | 2022-01-24 12:13:19 +0000 |
| commit | 25f5771aa44404877f0d5877cf1d16fd37f84b73 (patch) | |
| tree | 5496a502f15df7d25724c58ceab82af5f76fb7c4 /src/plugins/qmakeprojectmanager/makefileparse.cpp | |
| parent | 6cec0e203315bd2357893c92eef93375a890eb3c (diff) | |
Rename QtSupport::BaseQtVersion to QtVersion
... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.
Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makefileparse.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/makefileparse.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index ca274324641..9d14e5147f7 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -317,17 +317,17 @@ QString MakeFileParse::unparsedArguments() const return m_unparsedArguments; } -BaseQtVersion::QmakeBuildConfigs MakeFileParse::effectiveBuildConfig(BaseQtVersion::QmakeBuildConfigs defaultBuildConfig) const +QtVersion::QmakeBuildConfigs MakeFileParse::effectiveBuildConfig(QtVersion::QmakeBuildConfigs defaultBuildConfig) const { - BaseQtVersion::QmakeBuildConfigs buildConfig = defaultBuildConfig; + QtVersion::QmakeBuildConfigs buildConfig = defaultBuildConfig; if (m_qmakeBuildConfig.explicitDebug) - buildConfig = buildConfig | BaseQtVersion::DebugBuild; + buildConfig = buildConfig | QtVersion::DebugBuild; else if (m_qmakeBuildConfig.explicitRelease) - buildConfig = buildConfig & ~BaseQtVersion::DebugBuild; + buildConfig = buildConfig & ~QtVersion::DebugBuild; if (m_qmakeBuildConfig.explicitBuildAll) - buildConfig = buildConfig | BaseQtVersion::BuildAll; + buildConfig = buildConfig | QtVersion::BuildAll; else if (m_qmakeBuildConfig.explicitNoBuildAll) - buildConfig = buildConfig &~ BaseQtVersion::BuildAll; + buildConfig = buildConfig &~ QtVersion::BuildAll; return buildConfig; } |