QtSupport: Provide implementation of BaseQtVersion::qtAbisFromLibrary()

Derived implementation either used that as-is, or used the
result as part of their own operation.

Change-Id: I2817c4e6c6701ae647a70e77382dd30c8ea2bd2f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/android/androidqtversion.cpp

@@ -81,7 +81,7 @@ QString AndroidQtVersion::invalidReason() const
 
 QList<Abi> AndroidQtVersion::detectQtAbis() const
 {
-    QList<Abi> abis = qtAbisFromLibrary(qtCorePaths());
+    QList<Abi> abis = BaseQtVersion::detectQtAbis();
     for (int i = 0; i < abis.count(); ++i) {
         abis[i] = Abi(abis.at(i).architecture(),
                       abis.at(i).os(),

src/plugins/ios/iosqtversion.cpp

@@ -71,7 +71,7 @@ QString IosQtVersion::invalidReason() const
 
 QList<Abi> IosQtVersion::detectQtAbis() const
 {
-    QList<Abi> abis = qtAbisFromLibrary(qtCorePaths());
+    QList<Abi> abis = BaseQtVersion::detectQtAbis();
     for (int i = 0; i < abis.count(); ++i) {
         abis[i] = Abi(abis.at(i).architecture(),
                       abis.at(i).os(),

src/plugins/qnx/qnxqtversion.cpp

@@ -131,7 +131,7 @@ void QnxQtVersion::fromMap(const QVariantMap &map)
 QList<ProjectExplorer::Abi> 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

src/plugins/qtsupport/baseqtversion.cpp

@@ -619,6 +619,11 @@ QList<Abi> BaseQtVersion::qtAbis() const
     return m_qtAbis;
 }
 
+QList<Abi> BaseQtVersion::detectQtAbis() const
+{
+    return qtAbisFromLibrary(qtCorePaths());
+}
+
 bool BaseQtVersion::equals(BaseQtVersion *other)
 {
     if (m_qmakeCommand != other->m_qmakeCommand)

src/plugins/qtsupport/baseqtversion.h

@@ -138,7 +138,7 @@ public:
     virtual QString toHtml(bool verbose) const;
 
     QList<ProjectExplorer::Abi> qtAbis() const;
-    virtual QList<ProjectExplorer::Abi> detectQtAbis() const = 0;
+    virtual QList<ProjectExplorer::Abi> detectQtAbis() const;
 
     enum PropertyVariant { PropertyVariantDev, PropertyVariantGet, PropertyVariantSrc };
     QString qmakeProperty(const QByteArray &name,

src/plugins/qtsupport/desktopqtversion.cpp

@@ -66,11 +66,6 @@ QStringList DesktopQtVersion::warningReason() const
     return ret;
 }
 
-QList<ProjectExplorer::Abi> DesktopQtVersion::detectQtAbis() const
-{
-    return qtAbisFromLibrary(qtCorePaths());
-}
-
 QString DesktopQtVersion::description() const
 {
     return QCoreApplication::translate("QtVersion", "Desktop", "Qt Version is meant for the desktop");

src/plugins/qtsupport/desktopqtversion.h

@@ -42,8 +42,6 @@ public:
 
     QStringList warningReason() const override;
 
-    QList<ProjectExplorer::Abi> detectQtAbis() const override;
-
     QString description() const override;
 
     QSet<Core::Id> availableFeatures() const override;

src/plugins/remotelinux/embeddedlinuxqtversion.cpp

@@ -45,11 +45,6 @@ QString EmbeddedLinuxQtVersion::type() const
     return QLatin1String(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
 }
 
-QList<ProjectExplorer::Abi> EmbeddedLinuxQtVersion::detectQtAbis() const
-{
-    return qtAbisFromLibrary(qtCorePaths());
-}
-
 QString EmbeddedLinuxQtVersion::description() const
 {
     return QCoreApplication::translate("QtVersion", "Embedded Linux", "Qt Version is used for embedded Linux development");

src/plugins/remotelinux/embeddedlinuxqtversion.h

@@ -40,8 +40,6 @@ public:
 
     QString type() const override;
 
-    QList<ProjectExplorer::Abi> detectQtAbis() const override;
-
     QString description() const override;
 
     QSet<Core::Id> targetDeviceTypes() const override;

src/plugins/winrt/winrtphoneqtversion.cpp

@@ -65,11 +65,6 @@ QSet<Core::Id> WinRtPhoneQtVersion::availableFeatures() const
     return features;
 }
 
-QList<ProjectExplorer::Abi> WinRtPhoneQtVersion::detectQtAbis() const
-{
-    return qtAbisFromLibrary(qtCorePaths());
-}
-
 // Factory
 
 WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory()

src/plugins/winrt/winrtphoneqtversion.h

@@ -37,7 +37,6 @@ public:
     WinRtPhoneQtVersion() = default;
 
     QSet<Core::Id> availableFeatures() const override;
-    QList<ProjectExplorer::Abi> detectQtAbis() const override;
 
     QString description() const override;
     BaseQtVersion *clone() const override;

src/plugins/winrt/winrtqtversion.cpp

@@ -58,11 +58,6 @@ QSet<Core::Id> WinRtQtVersion::availableFeatures() const
     return features;
 }
 
-QList<ProjectExplorer::Abi> WinRtQtVersion::detectQtAbis() const
-{
-    return qtAbisFromLibrary(qtCorePaths());
-}
-
 QSet<Core::Id> WinRtQtVersion::targetDeviceTypes() const
 {
     return {Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR};

src/plugins/winrt/winrtqtversion.h

@@ -41,7 +41,6 @@ public:
     QString type() const override;
     QString description() const override;
     QSet<Core::Id> availableFeatures() const override;
-    QList<ProjectExplorer::Abi> detectQtAbis() const override;
 
     QSet<Core::Id> targetDeviceTypes() const override;
 };