diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index 50a35847d8a..eee23e08ca0 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -12,7 +12,6 @@ SOURCES += qnxplugin.cpp \ qnxdebugsupport.cpp \ qnxqtversionfactory.cpp \ qnxqtversion.cpp \ - qnxdeployconfiguration.cpp \ qnxdevice.cpp \ qnxdevicetester.cpp \ qnxdeviceprocesssignaloperation.cpp \ @@ -38,7 +37,6 @@ HEADERS += qnxplugin.h\ qnxdebugsupport.h \ qnxqtversionfactory.h \ qnxqtversion.h \ - qnxdeployconfiguration.h \ qnxdevice.h \ qnxdevicetester.h \ qnxdeviceprocesssignaloperation.h \ diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index 6965b5eb166..2f29172038e 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/src/plugins/qnx/qnx.qbs @@ -30,8 +30,6 @@ QtcPlugin { "qnxanalyzesupport.h", "qnxdebugsupport.cpp", "qnxdebugsupport.h", - "qnxdeployconfiguration.cpp", - "qnxdeployconfiguration.h", "qnxdevice.cpp", "qnxdevice.h", "qnxdevicefactory.cpp", diff --git a/src/plugins/qnx/qnxdeployconfiguration.cpp b/src/plugins/qnx/qnxdeployconfiguration.cpp deleted file mode 100644 index 2ff9ed9c004..00000000000 --- a/src/plugins/qnx/qnxdeployconfiguration.cpp +++ /dev/null @@ -1,56 +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 "qnxdeployconfiguration.h" - -#include "qnxconstants.h" -#include "qnxdevicefactory.h" - -#include - -#include -#include - -using namespace ProjectExplorer; -using namespace RemoteLinux; - -namespace Qnx { -namespace Internal { - -QnxDeployConfigurationFactory::QnxDeployConfigurationFactory() -{ - setConfigBaseId(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID); - setDefaultDisplayName(QCoreApplication::translate("Qnx::Internal::QnxDeployConfiguration", - "Deploy to QNX Device")); - addSupportedTargetDeviceType(QnxDeviceFactory::deviceType()); - setUseDeploymentDataView(); - - addInitialStep(DeviceCheckBuildStep::stepId()); - addInitialStep(RemoteLinuxCheckForFreeDiskSpaceStep::stepId()); - addInitialStep(GenericDirectUploadStep::stepId()); -} - -} // namespace Internal -} // namespace Qnx diff --git a/src/plugins/qnx/qnxdeployconfiguration.h b/src/plugins/qnx/qnxdeployconfiguration.h deleted file mode 100644 index 397b32d0623..00000000000 --- a/src/plugins/qnx/qnxdeployconfiguration.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 - -namespace Qnx { -namespace Internal { - -class QnxDeployConfigurationFactory : public ProjectExplorer::DeployConfigurationFactory -{ -public: - QnxDeployConfigurationFactory(); -}; - -} // namespace Internal -} // namespace Qnx diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 850efa48dc4..e316742f2c1 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -29,7 +29,6 @@ #include "qnxconfigurationmanager.h" #include "qnxconstants.h" #include "qnxdebugsupport.h" -#include "qnxdeployconfiguration.h" #include "qnxdevice.h" #include "qnxdevicefactory.h" #include "qnxqtversion.h" @@ -46,6 +45,7 @@ #include #include +#include #include #include #include @@ -81,6 +81,23 @@ public: } }; +class QnxDeployConfigurationFactory : public DeployConfigurationFactory +{ +public: + QnxDeployConfigurationFactory() + { + setConfigBaseId(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID); + setDefaultDisplayName(QCoreApplication::translate("Qnx::Internal::QnxDeployConfiguration", + "Deploy to QNX Device")); + addSupportedTargetDeviceType(QnxDeviceFactory::deviceType()); + setUseDeploymentDataView(); + + addInitialStep(DeviceCheckBuildStep::stepId()); + addInitialStep(RemoteLinux::RemoteLinuxCheckForFreeDiskSpaceStep::stepId()); + addInitialStep(RemoteLinux::GenericDirectUploadStep::stepId()); + } +}; + class QnxPluginPrivate { public: