make BaseQtVersion::qtCorePaths() non-static

simplifies the call sites.

Change-Id: I651644c641e9763a2c5f41a5644d8c2cf44469fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

src/plugins/android/androidqtversion.cpp

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

src/plugins/ios/iosqtversion.cpp

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

src/plugins/qnx/qnxqtversion.cpp

@@ -139,7 +139,7 @@ void QnxQtVersion::fromMap(const QVariantMap &map)
 QList<ProjectExplorer::Abi> QnxQtVersion::detectQtAbis() const
 {
     ensureMkSpecParsed();
-    return qtAbisFromLibrary(qtCorePaths(versionInfo(), qtVersionString()));
+    return qtAbisFromLibrary(qtCorePaths());
 }
 
 void QnxQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const

src/plugins/qtsupport/baseqtversion.cpp

@@ -1686,11 +1686,13 @@ bool BaseQtVersion::isQtQuickCompilerSupported(QString *reason) const
     return true;
 }
 
-FileNameList BaseQtVersion::qtCorePaths(const QHash<QString,QString> &versionInfo, const QString &versionString)
+FileNameList BaseQtVersion::qtCorePaths() const
 {
+    const QString &versionString = qtVersionString();
+
     QStringList dirs;
-    dirs << qmakeProperty(versionInfo, "QT_INSTALL_LIBS")
-         << qmakeProperty(versionInfo, "QT_INSTALL_BINS");
+    dirs << qmakeProperty(versionInfo(), "QT_INSTALL_LIBS")
+         << qmakeProperty(versionInfo(), "QT_INSTALL_BINS");
 
     FileNameList staticLibs;
     FileNameList dynamicLibs;

src/plugins/qtsupport/baseqtversion.h

@@ -238,8 +238,7 @@ protected:
     virtual QList<ProjectExplorer::Task> reportIssuesImpl(const QString &proFile, const QString &buildDir) const;
 
     // helper function for desktop and simulator to figure out the supported abis based on the libraries
-    static Utils::FileNameList qtCorePaths(const QHash<QString,QString> &versionInfo,
-                                           const QString &versionString);
+    Utils::FileNameList qtCorePaths() const;
     static QList<ProjectExplorer::Abi> qtAbisFromLibrary(const Utils::FileNameList &coreLibraries);
 
     void ensureMkSpecParsed() const;

src/plugins/qtsupport/desktopqtversion.cpp

@@ -75,7 +75,7 @@ QStringList DesktopQtVersion::warningReason() const
 
 QList<ProjectExplorer::Abi> DesktopQtVersion::detectQtAbis() const
 {
-    return qtAbisFromLibrary(qtCorePaths(versionInfo(), qtVersionString()));
+    return qtAbisFromLibrary(qtCorePaths());
 }
 
 QString DesktopQtVersion::description() const

src/plugins/remotelinux/embeddedlinuxqtversion.cpp

@@ -53,7 +53,7 @@ QString EmbeddedLinuxQtVersion::type() const
 
 QList<ProjectExplorer::Abi> EmbeddedLinuxQtVersion::detectQtAbis() const
 {
-    return qtAbisFromLibrary(qtCorePaths(versionInfo(), qtVersionString()));
+    return qtAbisFromLibrary(qtCorePaths());
 }
 
 QString EmbeddedLinuxQtVersion::description() const

src/plugins/winrt/winrtqtversion.cpp

@@ -67,7 +67,7 @@ QSet<Core::Id> WinRtQtVersion::availableFeatures() const
 
 QList<ProjectExplorer::Abi> WinRtQtVersion::detectQtAbis() const
 {
-    return qtAbisFromLibrary(qtCorePaths(versionInfo(), qtVersionString()));
+    return qtAbisFromLibrary(qtCorePaths());
 }
 
 QSet<Core::Id> WinRtQtVersion::targetDeviceTypes() const