From ca9e6a6e0e928387596b3eae573cd9d1e752290c Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 29 Jun 2023 11:19:28 +0200 Subject: [PATCH] ProjectExplorer: Merge device settings file pair, part 2 Change-Id: I21d0d077f3586316b9238b6aa050e9597afb5976 Reviewed-by: Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/CMakeLists.txt | 2 +- .../{devicesettingswidget.cpp => devicesettingspage.cpp} | 2 +- .../{devicesettingswidget.h => devicesettingspage.h} | 0 src/plugins/projectexplorer/projectexplorer.cpp | 2 +- src/plugins/projectexplorer/projectexplorer.qbs | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/plugins/projectexplorer/devicesupport/{devicesettingswidget.cpp => devicesettingspage.cpp} (99%) rename src/plugins/projectexplorer/devicesupport/{devicesettingswidget.h => devicesettingspage.h} (100%) diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 9c6d81eaa18..eccfecea050 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -55,7 +55,7 @@ add_qtc_plugin(ProjectExplorer devicesupport/devicemanager.cpp devicesupport/devicemanager.h devicesupport/devicemanagermodel.cpp devicesupport/devicemanagermodel.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/deviceusedportsgatherer.cpp devicesupport/deviceusedportsgatherer.h devicesupport/filetransfer.cpp devicesupport/filetransfer.h diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp similarity index 99% rename from src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp rename to src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 61db581ed4e..4e40255b468 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // 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 "devicemanager.h" diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingspage.h similarity index 100% rename from src/plugins/projectexplorer/devicesupport/devicesettingswidget.h rename to src/plugins/projectexplorer/devicesupport/devicesettingspage.h diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 85f768913a7..0b57384ea22 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -37,7 +37,7 @@ #include "devicesupport/desktopdevicefactory.h" #include "devicesupport/devicecheckbuildstep.h" #include "devicesupport/devicemanager.h" -#include "devicesupport/devicesettingswidget.h" +#include "devicesupport/devicesettingspage.h" #include "devicesupport/sshsettings.h" #include "devicesupport/sshsettingspage.h" #include "editorsettingspropertiespage.h" diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 3fa62265613..0b3cbe5fe01 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -209,7 +209,7 @@ Project { "devicemanager.cpp", "devicemanager.h", "devicemanagermodel.cpp", "devicemanagermodel.h", "deviceprocessesdialog.cpp", "deviceprocessesdialog.h", - "devicesettingswidget.cpp", "devicesettingswidget.h", + "devicesettingspage.cpp", "devicesettingspage.h", "devicetestdialog.cpp", "devicetestdialog.h", "deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h", "filetransfer.cpp", "filetransfer.h",