QtSupport et al: Move QtVersionFactory to *QtVersion implementation

At most a dozen lines each left.

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

44 files changed, 167 insertions, 553 deletions

diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index e48edd2fee..11f36185fe 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -19,7 +19,6 @@ HEADERS += \
     androidrunner.h \
     androidrunnerworker.h \
     androiddebugsupport.h \
-    androidqtversionfactory.h \
     androidqtversion.h \
     androidcreatekeystorecertificate.h \
     javaparser.h \
@@ -67,7 +66,6 @@ SOURCES += \
     androidrunner.cpp \
     androidrunnerworker.cpp \
     androiddebugsupport.cpp \
-    androidqtversionfactory.cpp \
     androidqtversion.cpp \
     androidcreatekeystorecertificate.cpp \
     javaparser.cpp \
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 912bca631e..0b8b925504 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -75,8 +75,6 @@ Project {
             "androidqmltoolingsupport.h",
             "androidqtversion.cpp",
             "androidqtversion.h",
-            "androidqtversionfactory.cpp",
-            "androidqtversionfactory.h",
             "androidrunconfiguration.cpp",
             "androidrunconfiguration.h",
             "androidrunenvironmentaspect.h",
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 966dbc94e5..10cb97b12f 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -37,7 +37,7 @@
 #include "androidpackageinstallationstep.h"
 #include "androidpotentialkit.h"
 #include "androidqmltoolingsupport.h"
-#include "androidqtversionfactory.h"
+#include "androidqtversion.h"
 #include "androidrunconfiguration.h"
 #include "androidruncontrol.h"
 #include "androidsettingspage.h"
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index bb9302f7bd..576e22c8d0 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -42,9 +42,11 @@
 
 #include <proparser/profileevaluator.h>
 
-using namespace Android::Internal;
 using namespace ProjectExplorer;
 
+namespace Android {
+namespace Internal {
+
 AndroidQtVersion::AndroidQtVersion()
     : QtSupport::BaseQtVersion()
 {
@@ -154,3 +156,22 @@ QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
 {
     return {Constants::ANDROID_DEVICE_TYPE};
 }
+
+
+// Factory
+
+AndroidQtVersionFactory::AndroidQtVersionFactory()
+{
+    setQtVersionCreator([] { return new AndroidQtVersion; });
+    setSupportedType(Constants::ANDROIDQT);
+    setPriority(90);
+
+    setRestrictionChecker([](const SetupData &setup) {
+        return !setup.config.contains("android-no-sdk")
+                && (setup.config.contains("android")
+                    || setup.platforms.contains("android"));
+    });
+}
+
+} // Internal
+} // Android
diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h
index baffad526c..7cfcd44123 100644
--- a/src/plugins/android/androidqtversion.h
+++ b/src/plugins/android/androidqtversion.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtversionfactory.h>
 
 #include <QCoreApplication>
 
@@ -62,5 +63,11 @@ private:
     mutable int m_minNdk = -1;
 };
 
+class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
+{
+public:
+    AndroidQtVersionFactory();
+};
+
 } // namespace Internal
 } // namespace Android
diff --git a/src/plugins/android/androidqtversionfactory.cpp b/src/plugins/android/androidqtversionfactory.cpp
deleted file mode 100644
index 55f66845ed..0000000000
--- a/src/plugins/android/androidqtversionfactory.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "androidqtversionfactory.h"
-#include "androidqtversion.h"
-#include "androidconstants.h"
-
-namespace Android {
-namespace Internal {
-
-AndroidQtVersionFactory::AndroidQtVersionFactory()
-{
-    setQtVersionCreator([] { return new AndroidQtVersion; });
-    setSupportedType(Constants::ANDROIDQT);
-    setPriority(90);
-
-    setRestrictionChecker([](const SetupData &setup) {
-        return !setup.config.contains("android-no-sdk")
-              && (setup.config.contains("android")
-                  || setup.platforms.contains("android"));
-    });
-}
-
-} // Internal
-} // Android
diff --git a/src/plugins/android/androidqtversionfactory.h b/src/plugins/android/androidqtversionfactory.h
deleted file mode 100644
index 911e87fd83..0000000000
--- a/src/plugins/android/androidqtversionfactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <qtsupport/qtversionfactory.h>
-
-namespace Android {
-namespace Internal {
-
-class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
-{
-public:
-    AndroidQtVersionFactory();
-};
-
-} // namespace Internal
-} // namespace Android
diff --git a/src/plugins/ios/ios.pro b/src/plugins/ios/ios.pro
index d4e4d9e05d..a6bf22abf8 100644
--- a/src/plugins/ios/ios.pro
+++ b/src/plugins/ios/ios.pro
@@ -15,7 +15,6 @@ HEADERS += \
     iossettingswidget.h \
     iosrunner.h \
     iosdsymbuildstep.h \
-    iosqtversionfactory.h \
     iosqtversion.h \
     iosplugin.h \
     iosdevicefactory.h \
@@ -42,7 +41,6 @@ SOURCES += \
     iossettingswidget.cpp \
     iosrunner.cpp \
     iosdsymbuildstep.cpp \
-    iosqtversionfactory.cpp \
     iosqtversion.cpp \
     iosplugin.cpp \
     iosdevicefactory.cpp \
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index c5553f9e45..223b7705ad 100644
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -47,8 +47,6 @@ QtcPlugin {
         "iosprobe.h",
         "iosqtversion.cpp",
         "iosqtversion.h",
-        "iosqtversionfactory.cpp",
-        "iosqtversionfactory.h",
         "iosrunconfiguration.cpp",
         "iosrunconfiguration.h",
         "iosrunner.cpp",
diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp
index 401b2a050c..b7c7172eae 100644
--- a/src/plugins/ios/iosplugin.cpp
+++ b/src/plugins/ios/iosplugin.cpp
@@ -32,7 +32,7 @@
 #include "iosdeploystep.h"
 #include "iosdevicefactory.h"
 #include "iosdsymbuildstep.h"
-#include "iosqtversionfactory.h"
+#include "iosqtversion.h"
 #include "iosrunner.h"
 #include "iossettingspage.h"
 #include "iossimulator.h"
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp
index b6cb2a037e..ef46b2bff9 100644
--- a/src/plugins/ios/iosqtversion.cpp
+++ b/src/plugins/ios/iosqtversion.cpp
@@ -108,3 +108,16 @@ QSet<Core::Id> IosQtVersion::targetDeviceTypes() const
     // iOS Qt version supports ios devices as well as simulator.
     return {Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE};
 }
+
+
+// Factory
+
+IosQtVersionFactory::IosQtVersionFactory()
+{
+    setQtVersionCreator([] { return new IosQtVersion; });
+    setSupportedType(Constants::IOSQT);
+    setPriority(90);
+    setRestrictionChecker([](const SetupData &setup) {
+        return setup.platforms.contains("ios");
+    });
+}
diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h
index 203a0961f3..8ae07c4ce0 100644
--- a/src/plugins/ios/iosqtversion.h
+++ b/src/plugins/ios/iosqtversion.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtversionfactory.h>
 
 #include <QCoreApplication>
 
@@ -54,5 +55,11 @@ public:
     QString description() const override;
 };
 
+class IosQtVersionFactory : public QtSupport::QtVersionFactory
+{
+public:
+    IosQtVersionFactory();
+};
+
 } // namespace Internal
 } // namespace Ios
diff --git a/src/plugins/ios/iosqtversionfactory.cpp b/src/plugins/ios/iosqtversionfactory.cpp
deleted file mode 100644
index c0e4421c2c..0000000000
--- a/src/plugins/ios/iosqtversionfactory.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "iosqtversionfactory.h"
-#include "iosqtversion.h"
-#include "iosconstants.h"
-
-namespace Ios {
-namespace Internal {
-
-IosQtVersionFactory::IosQtVersionFactory()
-{
-    setQtVersionCreator([] { return new IosQtVersion; });
-    setSupportedType(Constants::IOSQT);
-    setPriority(90);
-
-    setRestrictionChecker([](const SetupData &setup) {
-        return setup.platforms.contains("ios");
-    });
-}
-
-} // Internal
-} // Ios
diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h
deleted file mode 100644
index 37219ed44e..0000000000
--- a/src/plugins/ios/iosqtversionfactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <qtsupport/qtversionfactory.h>
-
-namespace Ios {
-namespace Internal {
-
-class IosQtVersionFactory : public QtSupport::QtVersionFactory
-{
-public:
-    IosQtVersionFactory();
-};
-
-} // namespace Internal
-} // namespace Ios
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
index eee23e08ca..ac292b42c6 100644
--- a/src/plugins/qnx/qnx.pro
+++ b/src/plugins/qnx/qnx.pro
@@ -10,7 +10,6 @@ SOURCES += qnxplugin.cpp \
     qnxrunconfiguration.cpp \
     qnxanalyzesupport.cpp \
     qnxdebugsupport.cpp \
-    qnxqtversionfactory.cpp \
     qnxqtversion.cpp \
     qnxdevice.cpp \
     qnxdevicetester.cpp \
@@ -35,7 +34,6 @@ HEADERS += qnxplugin.h\
     qnxrunconfiguration.h \
     qnxanalyzesupport.h \
     qnxdebugsupport.h \
-    qnxqtversionfactory.h \
     qnxqtversion.h \
     qnxdevice.h \
     qnxdevicetester.h \
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 2f29172038..143a1f10aa 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -57,8 +57,6 @@ QtcPlugin {
         "qnxplugin.h",
         "qnxqtversion.cpp",
         "qnxqtversion.h",
-        "qnxqtversionfactory.cpp",
-        "qnxqtversionfactory.h",
         "qnxrunconfiguration.cpp",
         "qnxrunconfiguration.h",
         "qnxutils.cpp",
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index e30beec6ee..3d64e720bf 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -32,7 +32,6 @@
 #include "qnxdevice.h"
 #include "qnxdevicefactory.h"
 #include "qnxqtversion.h"
-#include "qnxqtversionfactory.h"
 #include "qnxrunconfiguration.h"
 #include "qnxsettingspage.h"
 #include "qnxtoolchain.h"
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index 9e58c0fc81..ea15fac4a4 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -199,5 +199,16 @@ QList<Utils::EnvironmentItem> QnxQtVersion::environment() const
     return QnxUtils::qnxEnvironment(sdpPath());
 }
 
+
+// Factory
+
+QnxQtVersionFactory::QnxQtVersionFactory()
+{
+    setQtVersionCreator([] { return new QnxQtVersion; });
+    setSupportedType(Constants::QNX_QNX_QT);
+    setPriority(50);
+    setRestrictionChecker([](const SetupData &setup) { return setup.isQnx; });
+}
+
 } // namespace Internal
 } // namespace Qnx
diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h
index 5a1ac46136..939beedb86 100644
--- a/src/plugins/qnx/qnxqtversion.h
+++ b/src/plugins/qnx/qnxqtversion.h
@@ -29,6 +29,7 @@
 #include "qnxqtversion.h"
 
 #include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtversionfactory.h>
 
 #include <utils/environment.h>
 
@@ -85,5 +86,11 @@ private:
     mutable QList<Utils::EnvironmentItem> m_qnxEnv;
 };
 
+class QnxQtVersionFactory : public QtSupport::QtVersionFactory
+{
+public:
+    QnxQtVersionFactory();
+};
+
 } // namespace Internal
 } // namespace Qnx
diff --git a/src/plugins/qnx/qnxqtversionfactory.cpp b/src/plugins/qnx/qnxqtversionfactory.cpp
deleted file mode 100644
index 883b0e61e1..0000000000
--- a/src/plugins/qnx/qnxqtversionfactory.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BlackBerry Limited. All rights reserved.
-** Contact: KDAB (info@kdab.com)
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "qnxqtversionfactory.h"
-
-#include "qnxconstants.h"
-#include "qnxqtversion.h"
-
-using namespace Qnx;
-using namespace Qnx::Internal;
-
-QnxQtVersionFactory::QnxQtVersionFactory()
-{
-    setQtVersionCreator([] { return new QnxQtVersion; });
-    setSupportedType(Constants::QNX_QNX_QT);
-    setPriority(50);
-    setRestrictionChecker([](const SetupData &setup) { return setup.isQnx; });
-}
-
diff --git a/src/plugins/qnx/qnxqtversionfactory.h b/src/plugins/qnx/qnxqtversionfactory.h
deleted file mode 100644
index db1df3cbfd..0000000000
--- a/src/plugins/qnx/qnxqtversionfactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BlackBerry Limited. All rights reserved.
-** Contact: KDAB (info@kdab.com)
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <qtsupport/qtversionfactory.h>
-
-namespace Qnx {
-namespace Internal {
-
-class QnxQtVersionFactory : public QtSupport::QtVersionFactory
-{
-public:
-    QnxQtVersionFactory();
-};
-
-} // namespace Internal
-} // namespace Qnx
diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp
index f6db881248..f97f90f5f8 100644
--- a/src/plugins/qtsupport/desktopqtversion.cpp
+++ b/src/plugins/qtsupport/desktopqtversion.cpp
@@ -38,7 +38,7 @@
 #include <QCoreApplication>
 #include <QFileInfo>
 
-using namespace QtSupport;
+namespace QtSupport {
 
 DesktopQtVersion::DesktopQtVersion()
     : BaseQtVersion()
@@ -119,3 +119,18 @@ QString DesktopQtVersion::qmlsceneCommand() const
 
 DesktopQtVersion::DesktopQtVersion(const DesktopQtVersion &other) = default;
 
+
+namespace Internal {
+
+// Factory
+
+DesktopQtVersionFactory::DesktopQtVersionFactory()
+{
+    setQtVersionCreator([] { return new DesktopQtVersion; });
+    setSupportedType(QtSupport::Constants::DESKTOPQT);
+    setPriority(0); // Lowest of all, we want to be the fallback
+    // No further restrictions. We are the fallback :) so we don't care what kind of qt it is.
+}
+
+} // Internal
+} // QtSupport
diff --git a/src/plugins/qtsupport/desktopqtversion.h b/src/plugins/qtsupport/desktopqtversion.h
index 4b74d95648..ab9eb7ebb4 100644
--- a/src/plugins/qtsupport/desktopqtversion.h
+++ b/src/plugins/qtsupport/desktopqtversion.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <qtsupport/qtversionfactory.h>
+
 #include "baseqtversion.h"
 
 namespace QtSupport {
@@ -58,4 +60,13 @@ private:
     mutable QString m_qmlsceneCommand;
 };
 
+namespace Internal {
+
+class DesktopQtVersionFactory : public QtVersionFactory
+{
+public:
+    DesktopQtVersionFactory();
+};
+
+} // Internal
 } // QtSupport
diff --git a/src/plugins/qtsupport/desktopqtversionfactory.cpp b/src/plugins/qtsupport/desktopqtversionfactory.cpp
deleted file mode 100644
index b7a8bcea90..0000000000
--- a/src/plugins/qtsupport/desktopqtversionfactory.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "desktopqtversionfactory.h"
-#include "desktopqtversion.h"
-#include <qtsupport/qtsupportconstants.h>
-
-using namespace QtSupport;
-using namespace QtSupport::Internal;
-
-DesktopQtVersionFactory::DesktopQtVersionFactory()
-{
-    setQtVersionCreator([] { return new DesktopQtVersion; });
-    setSupportedType(Constants::DESKTOPQT);
-    setPriority(0); // Lowest of all, we want to be the fallback
-    // No further restrictions. We are the fallback :) so we don't care what kind of qt it is.
-}
diff --git a/src/plugins/qtsupport/desktopqtversionfactory.h b/src/plugins/qtsupport/desktopqtversionfactory.h
deleted file mode 100644
index 00d308456e..0000000000
--- a/src/plugins/qtsupport/desktopqtversionfactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include "qtversionfactory.h"
-
-namespace QtSupport {
-namespace Internal {
-
-class DesktopQtVersionFactory : public QtVersionFactory
-{
-public:
-    DesktopQtVersionFactory();
-};
-
-} // Internal
-} // QtSupport
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index 3edc564354..78832697ea 100644
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -28,7 +28,6 @@ HEADERS += \
     exampleslistmodel.h \
     screenshotcropper.h \
     qtconfigwidget.h \
-    desktopqtversionfactory.h \
     desktopqtversion.h \
     uicgenerator.h \
     qscxmlcgenerator.h
@@ -53,7 +52,6 @@ SOURCES += \
     exampleslistmodel.cpp \
     screenshotcropper.cpp \
     qtconfigwidget.cpp \
-    desktopqtversionfactory.cpp \
     desktopqtversion.cpp \
     uicgenerator.cpp \
     qscxmlcgenerator.cpp
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 15794bafe4..25cba7a70c 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -104,8 +104,8 @@ Project {
         Group {
             name: "QtVersion"
             files: [
-                "desktopqtversion.cpp", "desktopqtversion.h",
-                "desktopqtversionfactory.cpp", "desktopqtversionfactory.h",
+                "desktopqtversion.cpp",
+                "desktopqtversion.h",
             ]
         }
 
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index bfb12a671a..daa32ce870 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -27,14 +27,17 @@
 
 #include "codegenerator.h"
 #include "codegensettingspage.h"
-#include "desktopqtversionfactory.h"
+#include "desktopqtversion.h"
 #include "gettingstartedwelcomepage.h"
 #include "qtkitinformation.h"
 #include "qtoptionspage.h"
+#include "qtsupportconstants.h"
+#include "qtversionfactory.h"
 #include "qtversionmanager.h"
 #include "uicgenerator.h"
 #include "qscxmlcgenerator.h"
 
+#include "desktopqtversion.h"
 #include "profilereader.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
index 9f99db46d6..ace6fd7178 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
@@ -60,5 +60,25 @@ QSet<Core::Id> EmbeddedLinuxQtVersion::targetDeviceTypes() const
     return {Constants::GenericLinuxOsType};
 }
 
+
+// Factory
+
+EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory()
+{
+    setQtVersionCreator([] { return new EmbeddedLinuxQtVersion; });
+    setSupportedType(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
+    setPriority(10);
+
+    setRestrictionChecker([](const SetupData &) {
+        EmbeddedLinuxQtVersion tempVersion;
+        QList<ProjectExplorer::Abi> abis = tempVersion.qtAbis();
+
+        // Note: This fails for e.g. intel/meego cross builds on x86 linux machines.
+        return  abis.count() == 1
+                && abis.at(0).os() == ProjectExplorer::Abi::LinuxOS
+                && !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0));
+    });
+}
+
 } // namespace Internal
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h
index f4eb9c0f26..cbf5426795 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.h
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtversionfactory.h>
 
 namespace RemoteLinux {
 namespace Internal {
@@ -46,5 +47,11 @@ public:
     QSet<Core::Id> targetDeviceTypes() const override;
 };
 
+class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory
+{
+public:
+    EmbeddedLinuxQtVersionFactory();
+};
+
 } // namespace Internal
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
deleted file mode 100644
index e657e81fa4..0000000000
--- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "embeddedlinuxqtversionfactory.h"
-
-#include "embeddedlinuxqtversion.h"
-#include "remotelinux_constants.h"
-
-namespace RemoteLinux {
-namespace Internal {
-
-EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory()
-{
-    setQtVersionCreator([] { return new EmbeddedLinuxQtVersion; });
-    setSupportedType(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
-    setPriority(10);
-
-    setRestrictionChecker([](const SetupData &) {
-        EmbeddedLinuxQtVersion tempVersion;
-        QList<ProjectExplorer::Abi> abis = tempVersion.qtAbis();
-
-        // Note: This fails for e.g. intel/meego cross builds on x86 linux machines.
-        return  abis.count() == 1
-                && abis.at(0).os() == ProjectExplorer::Abi::LinuxOS
-                && !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0));
-    });
-}
-
-} // namespace Internal
-} // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
deleted file mode 100644
index 2bcbbcae40..0000000000
--- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <qtsupport/qtversionfactory.h>
-
-namespace RemoteLinux {
-namespace Internal {
-
-class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory
-{
-public:
-    EmbeddedLinuxQtVersionFactory();
-};
-
-} // Internal
-} // RemoteLinux
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
index 027cc59b22..b1cab71cfa 100644
--- a/src/plugins/remotelinux/remotelinux.pro
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -4,7 +4,6 @@ include(../../qtcreatorplugin.pri)
 
 HEADERS += \
     embeddedlinuxqtversion.h \
-    embeddedlinuxqtversionfactory.h \
     remotelinuxenvironmentaspect.h \
     remotelinuxenvironmentaspectwidget.h \
     remotelinuxplugin.h \
@@ -49,7 +48,6 @@ HEADERS += \
 
 SOURCES += \
     embeddedlinuxqtversion.cpp \
-    embeddedlinuxqtversionfactory.cpp \
     remotelinuxenvironmentaspect.cpp \
     remotelinuxenvironmentaspectwidget.cpp \
     remotelinuxplugin.cpp \
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 1f553d662b..7eebf0b3f8 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -29,8 +29,6 @@ Project {
             "deploymenttimeinfo.h",
             "embeddedlinuxqtversion.cpp",
             "embeddedlinuxqtversion.h",
-            "embeddedlinuxqtversionfactory.cpp",
-            "embeddedlinuxqtversionfactory.h",
             "genericdirectuploadservice.cpp",
             "genericdirectuploadservice.h",
             "genericdirectuploadstep.cpp",
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index c9b3277681..e305e472e2 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -25,7 +25,7 @@
 
 #include "remotelinuxplugin.h"
 
-#include "embeddedlinuxqtversionfactory.h"
+#include "embeddedlinuxqtversion.h"
 #include "genericlinuxdeviceconfigurationfactory.h"
 #include "remotelinux_constants.h"
 #include "remotelinuxqmltoolingsupport.h"
diff --git a/src/plugins/winrt/winrt.pro b/src/plugins/winrt/winrt.pro
index 15b4a3bb98..313dbba189 100644
--- a/src/plugins/winrt/winrt.pro
+++ b/src/plugins/winrt/winrt.pro
@@ -10,7 +10,6 @@ HEADERS += \
     winrtphoneqtversion.h \
     winrtplugin.h \
     winrtqtversion.h \
-    winrtqtversionfactory.h \
     winrtrunconfiguration.h \
     winrtruncontrol.h \
     winrtrunnerhelper.h
@@ -24,7 +23,6 @@ SOURCES += \
     winrtphoneqtversion.cpp \
     winrtplugin.cpp \
     winrtqtversion.cpp \
-    winrtqtversionfactory.cpp \
     winrtrunconfiguration.cpp \
     winrtruncontrol.cpp \
     winrtrunnerhelper.cpp
diff --git a/src/plugins/winrt/winrt.qbs b/src/plugins/winrt/winrt.qbs
index 9053161c5c..931f29545c 100644
--- a/src/plugins/winrt/winrt.qbs
+++ b/src/plugins/winrt/winrt.qbs
@@ -29,8 +29,6 @@ QtcPlugin {
         "winrtplugin.h",
         "winrtqtversion.cpp",
         "winrtqtversion.h",
-        "winrtqtversionfactory.cpp",
-        "winrtqtversionfactory.h",
         "winrtrunconfiguration.cpp",
         "winrtrunconfiguration.h",
         "winrtruncontrol.cpp",
diff --git a/src/plugins/winrt/winrtphoneqtversion.cpp b/src/plugins/winrt/winrtphoneqtversion.cpp
index 99045d3f3f..aec898b965 100644
--- a/src/plugins/winrt/winrtphoneqtversion.cpp
+++ b/src/plugins/winrt/winrtphoneqtversion.cpp
@@ -55,5 +55,16 @@ QSet<Core::Id> WinRtPhoneQtVersion::targetDeviceTypes() const
     return {Constants::WINRT_DEVICE_TYPE_PHONE, Constants::WINRT_DEVICE_TYPE_EMULATOR};
 }
 
+
+// Factory
+
+WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory()
+{
+    setQtVersionCreator([] { return new WinRtPhoneQtVersion; });
+    setSupportedType(Constants::WINRT_WINPHONEQT);
+    setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winphone"); });
+    setPriority(10);
+}
+
 } // Internal
 } // WinRt
diff --git a/src/plugins/winrt/winrtphoneqtversion.h b/src/plugins/winrt/winrtphoneqtversion.h
index 1e298885e9..95dddce37f 100644
--- a/src/plugins/winrt/winrtphoneqtversion.h
+++ b/src/plugins/winrt/winrtphoneqtversion.h
@@ -42,5 +42,11 @@ public:
     QSet<Core::Id> targetDeviceTypes() const override;
 };
 
+class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
+{
+public:
+    WinRtPhoneQtVersionFactory();
+};
+
 } // Internal
 } // WinRt
diff --git a/src/plugins/winrt/winrtplugin.cpp b/src/plugins/winrt/winrtplugin.cpp
index b98d7c0080..d1479014ad 100644
--- a/src/plugins/winrt/winrtplugin.cpp
+++ b/src/plugins/winrt/winrtplugin.cpp
@@ -28,7 +28,8 @@
 #include "winrtdevice.h"
 #include "winrtdevicefactory.h"
 #include "winrtdeployconfiguration.h"
-#include "winrtqtversionfactory.h"
+#include "winrtqtversion.h"
+#include "winrtphoneqtversion.h"
 #include "winrtrunconfiguration.h"
 #include "winrtruncontrol.h"
 #include "winrtdebugsupport.h"
diff --git a/src/plugins/winrt/winrtqtversion.cpp b/src/plugins/winrt/winrtqtversion.cpp
index d9106322f4..eab9a7d1d1 100644
--- a/src/plugins/winrt/winrtqtversion.cpp
+++ b/src/plugins/winrt/winrtqtversion.cpp
@@ -68,5 +68,16 @@ QSet<Core::Id> WinRtQtVersion::targetDeviceTypes() const
     return {Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR};
 }
 
+
+// Factory
+
+WinRtQtVersionFactory::WinRtQtVersionFactory()
+{
+    setQtVersionCreator([] { return new WinRtQtVersion; });
+    setSupportedType(Constants::WINRT_WINRTQT);
+    setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winrt"); });
+    setPriority(10);
+}
+
 } // Internal
 } // WinRt
diff --git a/src/plugins/winrt/winrtqtversion.h b/src/plugins/winrt/winrtqtversion.h
index 6d272d097a..fe3abd9534 100644
--- a/src/plugins/winrt/winrtqtversion.h
+++ b/src/plugins/winrt/winrtqtversion.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtversionfactory.h>
 
 namespace WinRt {
 namespace Internal {
@@ -45,5 +46,11 @@ public:
     QSet<Core::Id> targetDeviceTypes() const override;
 };
 
+class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
+{
+public:
+    WinRtQtVersionFactory();
+};
+
 } // Internal
 } // WinRt
diff --git a/src/plugins/winrt/winrtqtversionfactory.cpp b/src/plugins/winrt/winrtqtversionfactory.cpp
deleted file mode 100644
index dfb30d8ed3..0000000000
--- a/src/plugins/winrt/winrtqtversionfactory.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "winrtqtversionfactory.h"
-
-#include "winrtconstants.h"
-#include "winrtphoneqtversion.h"
-
-namespace WinRt {
-namespace Internal {
-
-WinRtQtVersionFactory::WinRtQtVersionFactory()
-{
-    setQtVersionCreator([] { return new WinRtQtVersion; });
-    setSupportedType(Constants::WINRT_WINRTQT);
-    setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winrt"); });
-    setPriority(10);
-}
-
-WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory()
-{
-    setQtVersionCreator([] { return new WinRtPhoneQtVersion; });
-    setSupportedType(Constants::WINRT_WINPHONEQT);
-    setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winphone"); });
-    setPriority(10);
-}
-
-} // Internal
-} // WinRt
diff --git a/src/plugins/winrt/winrtqtversionfactory.h b/src/plugins/winrt/winrtqtversionfactory.h
deleted file mode 100644
index 510a330752..0000000000
--- a/src/plugins/winrt/winrtqtversionfactory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <qtsupport/qtversionfactory.h>
-
-namespace WinRt {
-namespace Internal {
-
-class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
-{
-public:
-    WinRtQtVersionFactory();
-};
-
-class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
-{
-public:
-    WinRtPhoneQtVersionFactory();
-};
-
-} // Internal
-} // WinRt