ProjectExplorer: Merge device settings file pair, part 2

Change-Id: I21d0d077f3586316b9238b6aa050e9597afb5976
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

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

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"

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"

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",