diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-20 20:39:38 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-23 17:26:01 +0000 |
| commit | 60fa4419592fe2b711665acc2d59e7cc27cfa40e (patch) | |
| tree | d4ea8e112ae5865332c23f614cf4ce42c5eb2a37 /src/plugins/qtsupport | |
| parent | 16a2db585f8208cf16ff9dc54e3032ee7d640669 (diff) | |
| download | qt-creator-60fa4419592fe2b711665acc2d59e7cc27cfa40e.tar.gz | |
make BaseQtVersion::qtCorePaths() non-static
simplifies the call sites.
Change-Id: I651644c641e9763a2c5f41a5644d8c2cf44469fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 3 | ||||
| -rw-r--r-- | src/plugins/qtsupport/desktopqtversion.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index a9bdd2899d..c99bb9575b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/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; diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 778020d53a..6c4f1f5d83 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/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; diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp index 830c9cc767..c111c0a228 100644 --- a/src/plugins/qtsupport/desktopqtversion.cpp +++ b/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 |