diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 2bfeb60b0e2..ec1291ec270 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -81,7 +81,7 @@ QString AndroidQtVersion::invalidReason() const QList AndroidQtVersion::detectQtAbis() const { - QList abis = qtAbisFromLibrary(qtCorePaths()); + QList abis = BaseQtVersion::detectQtAbis(); for (int i = 0; i < abis.count(); ++i) { abis[i] = Abi(abis.at(i).architecture(), abis.at(i).os(), diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp index ef46b2bff9b..3be02079739 100644 --- a/src/plugins/ios/iosqtversion.cpp +++ b/src/plugins/ios/iosqtversion.cpp @@ -71,7 +71,7 @@ QString IosQtVersion::invalidReason() const QList IosQtVersion::detectQtAbis() const { - QList abis = qtAbisFromLibrary(qtCorePaths()); + QList abis = BaseQtVersion::detectQtAbis(); for (int i = 0; i < abis.count(); ++i) { abis[i] = Abi(abis.at(i).architecture(), abis.at(i).os(), diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index ea15fac4a41..7269a09b9ff 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -131,7 +131,7 @@ void QnxQtVersion::fromMap(const QVariantMap &map) QList QnxQtVersion::detectQtAbis() const { ensureMkSpecParsed(); - return QnxUtils::convertAbis(qtAbisFromLibrary(qtCorePaths())); + return QnxUtils::convertAbis(BaseQtVersion::detectQtAbis()); } void QnxQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 4a6ed3b8541..bd046a81ecd 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -619,6 +619,11 @@ QList BaseQtVersion::qtAbis() const return m_qtAbis; } +QList BaseQtVersion::detectQtAbis() const +{ + return qtAbisFromLibrary(qtCorePaths()); +} + bool BaseQtVersion::equals(BaseQtVersion *other) { if (m_qmakeCommand != other->m_qmakeCommand) diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 37679529876..ca8837cf936 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -138,7 +138,7 @@ public: virtual QString toHtml(bool verbose) const; QList qtAbis() const; - virtual QList detectQtAbis() const = 0; + virtual QList detectQtAbis() const; enum PropertyVariant { PropertyVariantDev, PropertyVariantGet, PropertyVariantSrc }; QString qmakeProperty(const QByteArray &name, diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp index f97f90f5f83..7349f46e5b4 100644 --- a/src/plugins/qtsupport/desktopqtversion.cpp +++ b/src/plugins/qtsupport/desktopqtversion.cpp @@ -66,11 +66,6 @@ QStringList DesktopQtVersion::warningReason() const return ret; } -QList DesktopQtVersion::detectQtAbis() const -{ - return qtAbisFromLibrary(qtCorePaths()); -} - QString DesktopQtVersion::description() const { return QCoreApplication::translate("QtVersion", "Desktop", "Qt Version is meant for the desktop"); diff --git a/src/plugins/qtsupport/desktopqtversion.h b/src/plugins/qtsupport/desktopqtversion.h index ab9eb7ebb48..3aeee960efc 100644 --- a/src/plugins/qtsupport/desktopqtversion.h +++ b/src/plugins/qtsupport/desktopqtversion.h @@ -42,8 +42,6 @@ public: QStringList warningReason() const override; - QList detectQtAbis() const override; - QString description() const override; QSet availableFeatures() const override; diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp index ace6fd7178e..a163f418c4a 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp @@ -45,11 +45,6 @@ QString EmbeddedLinuxQtVersion::type() const return QLatin1String(RemoteLinux::Constants::EMBEDDED_LINUX_QT); } -QList EmbeddedLinuxQtVersion::detectQtAbis() const -{ - return qtAbisFromLibrary(qtCorePaths()); -} - QString EmbeddedLinuxQtVersion::description() const { return QCoreApplication::translate("QtVersion", "Embedded Linux", "Qt Version is used for embedded Linux development"); diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h index cbf54267957..d929d812159 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.h +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h @@ -40,8 +40,6 @@ public: QString type() const override; - QList detectQtAbis() const override; - QString description() const override; QSet targetDeviceTypes() const override; diff --git a/src/plugins/winrt/winrtphoneqtversion.cpp b/src/plugins/winrt/winrtphoneqtversion.cpp index bf0446c61ce..c1a657dc616 100644 --- a/src/plugins/winrt/winrtphoneqtversion.cpp +++ b/src/plugins/winrt/winrtphoneqtversion.cpp @@ -65,11 +65,6 @@ QSet WinRtPhoneQtVersion::availableFeatures() const return features; } -QList WinRtPhoneQtVersion::detectQtAbis() const -{ - return qtAbisFromLibrary(qtCorePaths()); -} - // Factory WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory() diff --git a/src/plugins/winrt/winrtphoneqtversion.h b/src/plugins/winrt/winrtphoneqtversion.h index 1a643d9f19f..c99c0e9c358 100644 --- a/src/plugins/winrt/winrtphoneqtversion.h +++ b/src/plugins/winrt/winrtphoneqtversion.h @@ -37,7 +37,6 @@ public: WinRtPhoneQtVersion() = default; QSet availableFeatures() const override; - QList detectQtAbis() const override; QString description() const override; BaseQtVersion *clone() const override; diff --git a/src/plugins/winrt/winrtqtversion.cpp b/src/plugins/winrt/winrtqtversion.cpp index eab9a7d1d1d..24e13cfec34 100644 --- a/src/plugins/winrt/winrtqtversion.cpp +++ b/src/plugins/winrt/winrtqtversion.cpp @@ -58,11 +58,6 @@ QSet WinRtQtVersion::availableFeatures() const return features; } -QList WinRtQtVersion::detectQtAbis() const -{ - return qtAbisFromLibrary(qtCorePaths()); -} - QSet WinRtQtVersion::targetDeviceTypes() const { return {Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR}; diff --git a/src/plugins/winrt/winrtqtversion.h b/src/plugins/winrt/winrtqtversion.h index fe3abd95347..e966df69013 100644 --- a/src/plugins/winrt/winrtqtversion.h +++ b/src/plugins/winrt/winrtqtversion.h @@ -41,7 +41,6 @@ public: QString type() const override; QString description() const override; QSet availableFeatures() const override; - QList detectQtAbis() const override; QSet targetDeviceTypes() const override; };