summaryrefslogtreecommitdiff
path: root/src/plugins/qtsupport/baseqtversion.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2013-10-18 13:01:57 +0200
committerTobias Hunger <tobias.hunger@digia.com>2013-10-18 13:22:17 +0200
commit844e9e664710466c9d68e000133e18ec344418a2 (patch)
tree762d88c9d53ea4bfcfc946ef8ef0e8ed3179cef8 /src/plugins/qtsupport/baseqtversion.h
parent163f11009692e9918750cfd6d839cb688652e5b6 (diff)
downloadqt-creator-844e9e664710466c9d68e000133e18ec344418a2.tar.gz
BaseQtVersion: Make qmakeProperty(versionInfo, name, ...) protected
This is a low level method which is not useful for normal usage. Change-Id: I5fd1c019856a8a84299f5b11c159ea6b0f5131a9 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.h')
-rw-r--r--src/plugins/qtsupport/baseqtversion.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 6ff0b22bf0..591717d90f 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -123,8 +123,6 @@ public:
// Returns the PREFIX, BINPREFIX, DOCPREFIX and similar information
QHash<QString,QString> versionInfo() const;
enum PropertyVariant { PropertyVariantGet, PropertyVariantSrc };
- static QString qmakeProperty(const QHash<QString,QString> &versionInfo, const QByteArray &name,
- PropertyVariant variant = PropertyVariantGet);
QString qmakeProperty(const QByteArray &name) const;
virtual void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const;
virtual Utils::Environment qmakeRunEnvironment() const;
@@ -243,6 +241,9 @@ protected:
BaseQtVersion();
BaseQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString());
+ static QString qmakeProperty(const QHash<QString,QString> &versionInfo, const QByteArray &name,
+ PropertyVariant variant = PropertyVariantGet);
+
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