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

ProjectExplorer: Merge Qbs* into DefaultDeployConfigurationFactory

Browse Source 
DefaultDeployConfigurationFactory used extra effort to not apply to the
Qbs (Desktop) case, with QbsDeployConfigurationFactory plugging exactly
that hole with essentially the same functionality, which is even the
default of the base class.

The only differences are the display name, which is dropped in this
patch, and the different keys in the .user file, which are updated
with this patch. Note that the display name "Qbs Install" for the
DeployConfiguration stays with this patch whereas a freshly created
one will get the default "Deploy Configuration" name.

Change-Id: I255371d0a0688fbc6303083eb6aa20563e876264
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-01-24 16:39:52 +01:00
parent 49bd5b6c50
commit e6a184fe5c
12 changed files with 39 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp
View File

@@ -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 "qbsdeployconfigurationfactory.h"
#include "qbsprojectmanagerconstants.h"
#include "qbsinstallstep.h"
#include <projectexplorer/projectexplorerconstants.h>
namespace QbsProjectManager {
namespace Internal {
QbsDeployConfigurationFactory::QbsDeployConfigurationFactory()
{
setConfigBaseId("Qbs.Deploy");
addSupportedTargetDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
setSupportedProjectType(Constants::PROJECT_ID);
setDefaultDisplayName(QCoreApplication::translate("Qbs", "Qbs Install"));
}
} // namespace Internal
} // namespace QbsProjectManager

40
src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h
View File

@@ -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 QbsProjectManager {
namespace Internal {
class QbsDeployConfigurationFactory : public ProjectExplorer::DeployConfigurationFactory
{
public:
QbsDeployConfigurationFactory();
};
} // namespace Internal
} // namespace QbsProjectManager

5
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -432,11 +432,6 @@ qbs::ProjectData QbsProject::qbsProjectData() const
return m_projectData;
}
bool QbsProject::needsSpecialDeployment() const
{
return true;
}
bool QbsProject::checkCancelStatus()
{
const CancelStatus cancelStatus = m_cancelStatus;

1
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -94,7 +94,6 @@ public:
qbs::Project qbsProject() const;
qbs::ProjectData qbsProjectData() const;
bool needsSpecialDeployment() const override;
void generateErrors(const qbs::ErrorInfo &e);
static QString uniqueProductName(const qbs::ProductData &product);

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

@@ -26,7 +26,6 @@ HEADERS = \
qbsbuildinfo.h \
qbsbuildstep.h \
qbscleanstep.h \
qbsdeployconfigurationfactory.h \
qbskitinformation.h \
qbsinstallstep.h \
qbslogsink.h \
@@ -53,7 +52,6 @@ SOURCES = \
qbsbuildinfo.cpp \
qbsbuildstep.cpp \
qbscleanstep.cpp \
qbsdeployconfigurationfactory.cpp \
qbsinstallstep.cpp \
qbskitinformation.cpp \
qbslogsink.cpp \

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

@@ -80,8 +80,6 @@ QtcPlugin {
"qbscleanstep.cpp",
"qbscleanstep.h",
"qbscleanstepconfigwidget.ui",
"qbsdeployconfigurationfactory.cpp",
"qbsdeployconfigurationfactory.h",
"qbsinstallstep.cpp",
"qbsinstallstep.h",
"qbsinstallstepconfigwidget.ui",

2
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -28,7 +28,6 @@
#include "qbsbuildconfiguration.h"
#include "qbsbuildstep.h"
#include "qbscleanstep.h"
#include "qbsdeployconfigurationfactory.h"
#include "qbsinstallstep.h"
#include "qbskitinformation.h"
#include "qbsnodes.h"
@@ -91,7 +90,6 @@ public:
QbsBuildStepFactory buildStepFactory;
QbsCleanStepFactory cleanStepFactory;
QbsInstallStepFactory installStepFactory;
QbsDeployConfigurationFactory deployConfigFactory;
QbsRunConfigurationFactory runConfigFactory;
QbsProfilesSettingsPage profilesSetttingsPage;
};