From 7563cd6d394be51d38859175f336ead15a7df721 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 14 Feb 2019 12:15:48 +0100
Subject: 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>
---
 src/plugins/winrt/winrtqtversionfactory.cpp | 16 ++--------------
 src/plugins/winrt/winrtqtversionfactory.h   |  4 ----
 2 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/plugins/winrt')

diff --git a/src/plugins/winrt/winrtqtversionfactory.cpp b/src/plugins/winrt/winrtqtversionfactory.cpp
index c8fe3970007..dfb30d8ed38 100644
--- a/src/plugins/winrt/winrtqtversionfactory.cpp
+++ b/src/plugins/winrt/winrtqtversionfactory.cpp
@@ -28,8 +28,6 @@
 #include "winrtconstants.h"
 #include "winrtphoneqtversion.h"
 
-#include <proparser/profileevaluator.h>
-
 namespace WinRt {
 namespace Internal {
 
@@ -37,27 +35,17 @@ WinRtQtVersionFactory::WinRtQtVersionFactory()
 {
     setQtVersionCreator([] { return new WinRtQtVersion; });
     setSupportedType(Constants::WINRT_WINRTQT);
+    setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winrt"); });
     setPriority(10);
 }
 
-bool WinRtQtVersionFactory::canCreate(ProFileEvaluator *evaluator) const
-{
-    return evaluator->values("QMAKE_PLATFORM").contains("winrt");
-}
-
-
-
 WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory()
 {
     setQtVersionCreator([] { return new WinRtPhoneQtVersion; });
     setSupportedType(Constants::WINRT_WINPHONEQT);
+    setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winphone"); });
     setPriority(10);
 }
 
-bool WinRtPhoneQtVersionFactory::canCreate(ProFileEvaluator *evaluator) const
-{
-    return evaluator->values("QMAKE_PLATFORM").contains("winphone");
-}
-
 } // Internal
 } // WinRt
diff --git a/src/plugins/winrt/winrtqtversionfactory.h b/src/plugins/winrt/winrtqtversionfactory.h
index 302a3ecf8d7..510a3307528 100644
--- a/src/plugins/winrt/winrtqtversionfactory.h
+++ b/src/plugins/winrt/winrtqtversionfactory.h
@@ -34,16 +34,12 @@ class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
 {
 public:
     WinRtQtVersionFactory();
-
-    bool canCreate(ProFileEvaluator *evaluator) const override;
 };
 
 class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
 {
 public:
     WinRtPhoneQtVersionFactory();
-
-    bool canCreate(ProFileEvaluator *evaluator) const override;
 };
 
 } // Internal
-- 
cgit v1.2.3