diff options
| author | hjk <hjk@qt.io> | 2019-02-14 12:15:48 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-02-15 16:07:11 +0000 |
| commit | 7563cd6d394be51d38859175f336ead15a7df721 (patch) | |
| tree | 9fdf89aa975030bde414b698452b18d1a50cbf2a /src/plugins/qnx | |
| parent | 4079dd5cbccc6471005d5e5ab86a564de02aa5c0 (diff) | |
QtSupport: Replace QtVersionFactory::canCreate
... by a functor checking some ad-hoc custom structure content.
This effectively replaces one ugliness (access to qmake specific
variable via qmake specific ProFileEvaluator) by an indirection
layer with similarly ungeneric contents, but I like the latter
setup better.
Change-Id: Iaee07c992fce4aabee2f4eae32a2413d772fe945
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qnx')
| -rw-r--r-- | src/plugins/qnx/qnxqtversionfactory.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/qnx/qnxqtversionfactory.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/qnx/qnxqtversionfactory.cpp b/src/plugins/qnx/qnxqtversionfactory.cpp index ad484ddc04a..883b0e61e15 100644 --- a/src/plugins/qnx/qnxqtversionfactory.cpp +++ b/src/plugins/qnx/qnxqtversionfactory.cpp @@ -28,8 +28,6 @@ #include "qnxconstants.h" #include "qnxqtversion.h" -#include <qtsupport/profilereader.h> - using namespace Qnx; using namespace Qnx::Internal; @@ -38,9 +36,6 @@ QnxQtVersionFactory::QnxQtVersionFactory() setQtVersionCreator([] { return new QnxQtVersion; }); setSupportedType(Constants::QNX_QNX_QT); setPriority(50); + setRestrictionChecker([](const SetupData &setup) { return setup.isQnx; }); } -bool QnxQtVersionFactory::canCreate(ProFileEvaluator *evaluator) const -{ - return evaluator->contains("QNX_CPUDIR"); -} diff --git a/src/plugins/qnx/qnxqtversionfactory.h b/src/plugins/qnx/qnxqtversionfactory.h index 4abdeaf31bb..db1df3cbfd9 100644 --- a/src/plugins/qnx/qnxqtversionfactory.h +++ b/src/plugins/qnx/qnxqtversionfactory.h @@ -34,8 +34,6 @@ class QnxQtVersionFactory : public QtSupport::QtVersionFactory { public: QnxQtVersionFactory(); - - bool canCreate(ProFileEvaluator *evaluator) const override; }; } // namespace Internal |