diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 13:33:14 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 14:01:25 +0000 |
| commit | 8a69c254757eab7852443b5e4bd5eafb68908d3d (patch) | |
| tree | 4e2d967e2c5d3f4bf53c595c7f00764106c5609c /src/plugins/qtsupport/baseqtversion.h | |
| parent | 8288ca1251fd49b10457b8f97e02e26f22c6ad31 (diff) | |
BaseQtVersion: use QMakeEvaluator's native format for m_versionInfo
Change-Id: I926bc97fe6fa510ac5a8fe77b64014333a69bd04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.h')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 34bb4b22e6..1fe09a2ef4 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -48,6 +48,8 @@ class Task; } // namespace ProjectExplorer QT_BEGIN_NAMESPACE +class ProKey; +class ProString; class ProFileEvaluator; class QMakeGlobals; class QSettings; @@ -246,14 +248,14 @@ private: enum Binaries { QmlViewer, QmlScene, Designer, Linguist, Uic, QScxmlc }; QString findQtBinary(Binaries binary) const; void updateMkspec() const; - QHash<QString,QString> versionInfo() const; + QHash<ProKey, ProString> versionInfo() const; static bool queryQMakeVariables(const Utils::FileName &binary, const Utils::Environment &env, - QHash<QString, QString> *versionInfo, QString *error = 0); - static QString qmakeProperty(const QHash<QString,QString> &versionInfo, const QByteArray &name, + QHash<ProKey, ProString> *versionInfo, QString *error = 0); + static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo, const QByteArray &name, PropertyVariant variant = PropertyVariantGet); - static Utils::FileName mkspecDirectoryFromVersionInfo(const QHash<QString, QString> &versionInfo); - static Utils::FileName mkspecFromVersionInfo(const QHash<QString, QString> &versionInfo); - static Utils::FileName sourcePath(const QHash<QString, QString> &versionInfo); + static Utils::FileName mkspecDirectoryFromVersionInfo(const QHash<ProKey,ProString> &versionInfo); + static Utils::FileName mkspecFromVersionInfo(const QHash<ProKey,ProString> &versionInfo); + static Utils::FileName sourcePath(const QHash<ProKey,ProString> &versionInfo); void setId(int id); // used by the qtversionmanager for legacy restore // and by the qtoptionspage to replace Qt versions @@ -286,7 +288,7 @@ private: mutable QHash<QString, QString> m_mkspecValues; - mutable QHash<QString,QString> m_versionInfo; + mutable QHash<ProKey, ProString> m_versionInfo; Utils::FileName m_qmakeCommand; mutable QString m_qtVersionString; |