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

ProjectExplorer: Merge device settings file pair, part 2

Browse Source 
Change-Id: I21d0d077f3586316b9238b6aa050e9597afb5976
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-06-29 11:19:28 +02:00
parent 5237998e5e
commit ca9e6a6e0e
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/CMakeLists.txt
View File

@@ -55,7 +55,7 @@ add_qtc_plugin(ProjectExplorer
devicesupport/devicemanager.cpp devicesupport/devicemanager.h devicesupport/devicemanager.cpp devicesupport/devicemanager.h
devicesupport/devicemanagermodel.cpp devicesupport/devicemanagermodel.h devicesupport/devicemanagermodel.cpp devicesupport/devicemanagermodel.h
devicesupport/deviceprocessesdialog.cpp devicesupport/deviceprocessesdialog.h devicesupport/deviceprocessesdialog.cpp devicesupport/deviceprocessesdialog.h
devicesupport/devicesettingswidget.cpp devicesupport/devicesettingswidget.h devicesupport/devicesettingspage.cpp devicesupport/devicesettingspage.h
devicesupport/devicetestdialog.cpp devicesupport/devicetestdialog.h devicesupport/devicetestdialog.cpp devicesupport/devicetestdialog.h
devicesupport/deviceusedportsgatherer.cpp devicesupport/deviceusedportsgatherer.h devicesupport/deviceusedportsgatherer.cpp devicesupport/deviceusedportsgatherer.h
devicesupport/filetransfer.cpp devicesupport/filetransfer.h devicesupport/filetransfer.cpp devicesupport/filetransfer.h

2
src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp → src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
View File

@@ -1,7 +1,7 @@
// Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "devicesettingswidget.h" #include "devicesettingspage.h"
#include "devicefactoryselectiondialog.h" #include "devicefactoryselectiondialog.h"
#include "devicemanager.h" #include "devicemanager.h"

0
src/plugins/projectexplorer/devicesupport/devicesettingswidget.h → src/plugins/projectexplorer/devicesupport/devicesettingspage.h
View File

2
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -37,7 +37,7 @@
#include "devicesupport/desktopdevicefactory.h" #include "devicesupport/desktopdevicefactory.h"
#include "devicesupport/devicecheckbuildstep.h" #include "devicesupport/devicecheckbuildstep.h"
#include "devicesupport/devicemanager.h" #include "devicesupport/devicemanager.h"
#include "devicesupport/devicesettingswidget.h" #include "devicesupport/devicesettingspage.h"
#include "devicesupport/sshsettings.h" #include "devicesupport/sshsettings.h"
#include "devicesupport/sshsettingspage.h" #include "devicesupport/sshsettingspage.h"
#include "editorsettingspropertiespage.h" #include "editorsettingspropertiespage.h"

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

@@ -209,7 +209,7 @@ Project {
"devicemanager.cpp", "devicemanager.h", "devicemanager.cpp", "devicemanager.h",
"devicemanagermodel.cpp", "devicemanagermodel.h", "devicemanagermodel.cpp", "devicemanagermodel.h",
"deviceprocessesdialog.cpp", "deviceprocessesdialog.h", "deviceprocessesdialog.cpp", "deviceprocessesdialog.h",
"devicesettingswidget.cpp", "devicesettingswidget.h", "devicesettingspage.cpp", "devicesettingspage.h",
"devicetestdialog.cpp", "devicetestdialog.h", "devicetestdialog.cpp", "devicetestdialog.h",
"deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h", "deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h",
"filetransfer.cpp", "filetransfer.h", "filetransfer.cpp", "filetransfer.h",