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

8
src/plugins/ios/iosqtversion.cpp
View File

@@ -44,7 +44,7 @@ IosQtVersion::IosQtVersion() = default;
bool IosQtVersion::isValid() const
{
if (!BaseQtVersion::isValid())
if (!QtVersion::isValid())
return false;
if (qtAbis().isEmpty())
return false;
@@ -53,7 +53,7 @@ bool IosQtVersion::isValid() const
QString IosQtVersion::invalidReason() const
{
QString tmp = BaseQtVersion::invalidReason();
QString tmp = QtVersion::invalidReason();
if (tmp.isEmpty() && qtAbis().isEmpty())
return tr("Failed to detect the ABIs used by the Qt version.");
return tmp;
@@ -61,7 +61,7 @@ QString IosQtVersion::invalidReason() const
Abis IosQtVersion::detectQtAbis() const
{
Abis abis = BaseQtVersion::detectQtAbis();
Abis abis = QtVersion::detectQtAbis();
for (int i = 0; i < abis.count(); ++i) {
abis[i] = Abi(abis.at(i).architecture(),
abis.at(i).os(),
@@ -80,7 +80,7 @@ QString IosQtVersion::description() const
QSet<Utils::Id> IosQtVersion::availableFeatures() const
{
QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
QSet<Utils::Id> features = QtSupport::QtVersion::availableFeatures();
features.insert(QtSupport::Constants::FEATURE_MOBILE);
features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);