diff options
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.h')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 464b292127..436a6e0387 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -64,7 +64,7 @@ public: QtVersionNumber(int ma = -1, int mi = -1, int p = -1); QtVersionNumber(const QString &versionString); - QSet<Core::Id> features() const; + QSet<Utils::Id> features() const; int majorVersion; int minorVersion; @@ -119,7 +119,6 @@ public: virtual QString toHtml(bool verbose) const; ProjectExplorer::Abis qtAbis() const; - virtual ProjectExplorer::Abis detectQtAbis() const; void applyProperties(QMakeGlobals *qmakeGlobals) const; virtual void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const; @@ -191,7 +190,7 @@ public: QString defaultUnexpandedDisplayName() const; - virtual QSet<Core::Id> targetDeviceTypes() const = 0; + virtual QSet<Utils::Id> targetDeviceTypes() const = 0; virtual ProjectExplorer::Tasks validateKit(const ProjectExplorer::Kit *k); @@ -234,15 +233,17 @@ public: static void populateQmlFileFinder(Utils::FileInProjectFinder *finder, const ProjectExplorer::Target *target); - QSet<Core::Id> features() const; + QSet<Utils::Id> features() const; protected: BaseQtVersion(); BaseQtVersion(const BaseQtVersion &other) = delete; - virtual QSet<Core::Id> availableFeatures() const; + virtual QSet<Utils::Id> availableFeatures() const; virtual ProjectExplorer::Tasks reportIssuesImpl(const QString &proFile, const QString &buildDir) const; + virtual ProjectExplorer::Abis detectQtAbis() const; + // helper function for desktop and simulator to figure out the supported abis based on the libraries static ProjectExplorer::Abis qtAbisFromLibrary(const Utils::FilePaths &coreLibraries); |