feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qnx: Move QnxDeployConfigurationFactory to plugin

Browse Source 
Too small to justify a compilation unit of its own.

Change-Id: I6f4c809278c87a8d96edcabb3ec7abf24a0c5172
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-01-29 09:36:58 +01:00
parent 74e36b3caa
commit 1f83e0d6d1
5 changed files with 18 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/qnx.pro
View File

@@ -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 \

2
src/plugins/qnx/qnx.qbs
View File

@@ -30,8 +30,6 @@ QtcPlugin {
"qnxanalyzesupport.h",
"qnxdebugsupport.cpp",
"qnxdebugsupport.h",
"qnxdeployconfiguration.cpp",
"qnxdeployconfiguration.h",
"qnxdevice.cpp",
"qnxdevice.h",
"qnxdevicefactory.cpp",

56
src/plugins/qnx/qnxdeployconfiguration.cpp
View File

@@ -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 <projectexplorer/devicesupport/devicecheckbuildstep.h>
#include <remotelinux/genericdirectuploadstep.h>
#include <remotelinux/remotelinuxcheckforfreediskspacestep.h>
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

40
src/plugins/qnx/qnxdeployconfiguration.h
View File

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

19
src/plugins/qnx/qnxplugin.cpp
View File

@@ -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 <coreplugin/icore.h>
#include <projectexplorer/devicesupport/devicecheckbuildstep.h>
#include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -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: