QtSupport: Split QtVersionFactory::create()

... into a 'canCreate()' and the actual creation, which can be
done by the already registered m_creator.

Simpler interface, with the (temporary) regression that the
EmbeddedLinuxQtVersion get constructed twice, once only to
determine that it should be alive afterwards. Will be fixed later.

Change-Id: I5da2cafe473b25a0207bbd628632c9a259780361
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 6 insertions, 10 deletions

diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
index 74b7bd106a..1ff52d2960 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
@@ -40,21 +40,17 @@ EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory()
     setPriority(10);
 }
 
-QtSupport::BaseQtVersion *EmbeddedLinuxQtVersionFactory::create(ProFileEvaluator *evaluator)
+bool EmbeddedLinuxQtVersionFactory::canCreate(ProFileEvaluator *evaluator) const
 {
     Q_UNUSED(evaluator);
 
-    auto version = new EmbeddedLinuxQtVersion;
+    EmbeddedLinuxQtVersion tempVersion;
+    QList<ProjectExplorer::Abi> abis = tempVersion.qtAbis();
 
-    QList<ProjectExplorer::Abi> abis = version->qtAbis();
     // Note: This fails for e.g. intel/meego cross builds on x86 linux machines.
-    if (abis.count() == 1
+    return  abis.count() == 1
             && abis.at(0).os() == ProjectExplorer::Abi::LinuxOS
-            && !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0)))
-        return version;
-
-    delete version;
-    return nullptr;
+            && !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0));
 }
 
 } // namespace Internal
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
index 7e341acb2f..11dbdf6480 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
+++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
@@ -35,7 +35,7 @@ class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory
 public:
     EmbeddedLinuxQtVersionFactory();
 
-    QtSupport::BaseQtVersion *create(ProFileEvaluator *evaluator) override;
+    bool canCreate(ProFileEvaluator *evaluator) const override;
 };
 
 } // Internal