aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/baseqtversion.h
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2018-01-15 13:58:46 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2018-02-05 14:37:35 +0000
commit4f537a5ea366e89618ec556b77bfc105ad7d068e (patch)
tree7245df9617842926da8d00270879c0944862028b /src/plugins/qtsupport/baseqtversion.h
parent6f5f07d2e47ece8f116ddff2025d9ef39c9a450b (diff)
QtSupport: Add setting for arbitrary features for a Qt version
Change-Id: I9cd296316bd100d6f867ca7bffefb9676dc66c09 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.h')
-rw-r--r--src/plugins/qtsupport/baseqtversion.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 8b23d827f3d..e71f9b3a071 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -205,7 +205,6 @@ public:
static QString defaultUnexpandedDisplayName(const Utils::FileName &qmakePath,
bool fromPath = false);
- virtual QSet<Core::Id> availableFeatures() const;
virtual QSet<Core::Id> targetDeviceTypes() const = 0;
virtual QList<ProjectExplorer::Task> validateKit(const ProjectExplorer::Kit *k);
@@ -237,7 +236,9 @@ public:
static void populateQmlFileFinder(Utils::FileInProjectFinder *finder,
const ProjectExplorer::Target *target);
+ QSet<Core::Id> features() const;
protected:
+ virtual QSet<Core::Id> availableFeatures() const;
BaseQtVersion();
BaseQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString());
BaseQtVersion(const BaseQtVersion &other);
@@ -294,6 +295,7 @@ private:
QString m_unexpandedDisplayName;
QString m_autodetectionSource;
+ QSet<Core::Id> m_overrideFeatures;
mutable Utils::FileName m_sourcePath;
mutable Utils::FileName m_qtSources;