iOS: Move IosDeploy*Factory to plugin

Change-Id: I752a497ce95609cfb92207e1dfbc6cf91ffa9f3c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/ios/ios.pro

@@ -25,9 +25,7 @@ HEADERS += \
     iosprobe.h \
     iosbuildstep.h \
     iostoolhandler.h \
-    iosdeployconfiguration.h \
     iosdeploystep.h \
-    iosdeploystepfactory.h \
     iosdeploystepwidget.h \
     simulatorcontrol.h \
     iosbuildconfiguration.h \
@@ -54,9 +52,7 @@ SOURCES += \
     iosprobe.cpp \
     iosbuildstep.cpp \
     iostoolhandler.cpp \
-    iosdeployconfiguration.cpp \
     iosdeploystep.cpp \
-    iosdeploystepfactory.cpp \
     iosdeploystepwidget.cpp \
     simulatorcontrol.cpp \
     iosbuildconfiguration.cpp \

src/plugins/ios/ios.qbs

@@ -29,12 +29,8 @@ QtcPlugin {
         "iosconfigurations.cpp",
         "iosconfigurations.h",
         "iosconstants.h",
-        "iosdeployconfiguration.cpp",
-        "iosdeployconfiguration.h",
         "iosdeploystep.cpp",
         "iosdeploystep.h",
-        "iosdeploystepfactory.cpp",
-        "iosdeploystepfactory.h",
         "iosdeploystepwidget.cpp",
         "iosdeploystepwidget.h",
         "iosdeploystepwidget.ui",

src/plugins/ios/iosdeployconfiguration.cpp

@@ -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 "iosconstants.h"
-#include "iosdeploystep.h"
-#include "iosdeployconfiguration.h"
-
-#include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/target.h>
-
-#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
-
-using namespace ProjectExplorer;
-
-namespace Ios {
-namespace Internal {
-
-IosDeployConfigurationFactory::IosDeployConfigurationFactory()
-{
-    setConfigBaseId("Qt4ProjectManager.IosDeployConfiguration");
-    setSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
-    addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE);
-    addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE);
-    setDefaultDisplayName(QCoreApplication::translate("Ios::Internal", "Deploy on iOS"));
-    addInitialStep(IosDeployStep::stepId());
-}
-
-} // namespace Internal
-} // namespace Ios

src/plugins/ios/iosdeployconfiguration.h

@@ -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 <projectexplorer/deployconfiguration.h>
-
-namespace Ios {
-namespace Internal {
-
-class IosDeployConfigurationFactory : public ProjectExplorer::DeployConfigurationFactory
-{
-public:
-    IosDeployConfigurationFactory();
-};
-
-} // namespace Internal
-} // namespace Ios

src/plugins/ios/iosdeploystepfactory.cpp

@@ -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.
-**
-****************************************************************************/
-
-#include "iosdeploystepfactory.h"
-
-#include "iosconstants.h"
-#include "iosdeploystep.h"
-
-#include <projectexplorer/projectexplorerconstants.h>
-
-namespace Ios {
-namespace Internal {
-
-IosDeployStepFactory::IosDeployStepFactory()
-{
-    registerStep<IosDeployStep>(IosDeployStep::stepId());
-    setDisplayName(IosDeployStep::tr("Deploy to iOS device or emulator"));
-    setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
-    setSupportedDeviceTypes({Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE});
-    setRepeatable(false);
-}
-
-} // namespace Internal
-} // namespace Ios

src/plugins/ios/iosdeploystepfactory.h

@@ -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 <projectexplorer/buildstep.h>
-
-namespace Ios {
-namespace Internal {
-
-class IosDeployStepFactory : public ProjectExplorer::BuildStepFactory
-{
-public:
-    IosDeployStepFactory();
-};
-
-} // namespace Internal
-} // namespace Ios

src/plugins/ios/iosplugin.cpp

@@ -29,8 +29,7 @@
 #include "iosbuildstep.h"
 #include "iosconfigurations.h"
 #include "iosconstants.h"
-#include "iosdeployconfiguration.h"
+#include "iosdeploystep.h"
-#include "iosdeploystepfactory.h"
 #include "iosdevicefactory.h"
 #include "iosdsymbuildstep.h"
 #include "iosqtversionfactory.h"
@@ -41,10 +40,13 @@
 #include "iostoolhandler.h"
 #include "iosrunconfiguration.h"
 
+#include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/runconfiguration.h>
 
+#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
+
 #include <qtsupport/qtversionmanager.h>
 
 using namespace ProjectExplorer;
@@ -55,6 +57,33 @@ namespace Internal {
 
 Q_LOGGING_CATEGORY(iosLog, "qtc.ios.common", QtWarningMsg)
 
+class IosDeployStepFactory : public BuildStepFactory
+{
+public:
+    IosDeployStepFactory()
+    {
+        registerStep<IosDeployStep>(IosDeployStep::stepId());
+        setDisplayName(IosDeployStep::tr("Deploy to iOS device or emulator"));
+        setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
+        setSupportedDeviceTypes({Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE});
+        setRepeatable(false);
+    }
+};
+
+class IosDeployConfigurationFactory : public DeployConfigurationFactory
+{
+public:
+    IosDeployConfigurationFactory()
+    {
+        setConfigBaseId("Qt4ProjectManager.IosDeployConfiguration");
+        setSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
+        addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE);
+        addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE);
+        setDefaultDisplayName(QCoreApplication::translate("Ios::Internal", "Deploy on iOS"));
+        addInitialStep(IosDeployStep::stepId());
+    }
+};
+
 class IosPluginPrivate
 {
 public: