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

Android: Merge manifesteditorwidget.* into manifesteditor.* (2/2)

Browse Source 
Rename the merged content in manifesteditorwidget.* to
manifesteditor.*

Change-Id: I417b427ea7ecbe1f76364a08981a45cfef2ca562
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2024-07-29 17:28:58 +02:00
parent e9fa336491
commit d79c9fe044
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ add_qtc_plugin(Android
androidglobal.h androidglobal.h
androidmanager.cpp androidmanager.h androidmanager.cpp androidmanager.h
androidmanifestdocument.cpp androidmanifestdocument.h androidmanifestdocument.cpp androidmanifestdocument.h
androidmanifesteditorwidget.cpp androidmanifesteditorwidget.h androidmanifesteditor.cpp androidmanifesteditor.h
androidmanifesteditoriconwidget.cpp androidmanifesteditoriconwidget.h androidmanifesteditoriconwidget.cpp androidmanifesteditoriconwidget.h
androidmanifesteditoriconcontainerwidget.cpp androidmanifesteditoriconcontainerwidget.h androidmanifesteditoriconcontainerwidget.cpp androidmanifesteditoriconcontainerwidget.h
androidpackageinstallationstep.cpp androidpackageinstallationstep.h androidpackageinstallationstep.cpp androidpackageinstallationstep.h

4
src/plugins/android/android.qbs
View File

@@ -44,8 +44,8 @@ QtcPlugin {
"androidmanifesteditoriconwidget.h", "androidmanifesteditoriconwidget.h",
"androidmanifesteditoriconcontainerwidget.cpp", "androidmanifesteditoriconcontainerwidget.cpp",
"androidmanifesteditoriconcontainerwidget.h", "androidmanifesteditoriconcontainerwidget.h",
"androidmanifesteditorwidget.cpp", "androidmanifesteditor.cpp",
"androidmanifesteditorwidget.h", "androidmanifesteditor.h",
"androidpackageinstallationstep.cpp", "androidpackageinstallationstep.cpp",
"androidpackageinstallationstep.h", "androidpackageinstallationstep.h",
"androidplugin.cpp", "androidplugin.cpp",

2
src/plugins/android/androidmanifestdocument.cpp
View File

@@ -2,7 +2,7 @@
// 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 "androidmanifestdocument.h" #include "androidmanifestdocument.h"
#include "androidmanifesteditorwidget.h" #include "androidmanifesteditor.h"
#include "androidconstants.h" #include "androidconstants.h"
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>

3
src/plugins/android/androidmanifesteditorwidget.cpp → src/plugins/android/androidmanifesteditor.cpp
View File

@@ -1,12 +1,13 @@
// 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 "androidmanifesteditor.h"
#include "androidconfigurations.h" #include "androidconfigurations.h"
#include "androidconstants.h" #include "androidconstants.h"
#include "androidmanager.h" #include "androidmanager.h"
#include "androidmanifestdocument.h" #include "androidmanifestdocument.h"
#include "androidmanifesteditoriconcontainerwidget.h" #include "androidmanifesteditoriconcontainerwidget.h"
#include "androidmanifesteditorwidget.h"
#include "androidtr.h" #include "androidtr.h"
#include "splashscreencontainerwidget.h" #include "splashscreencontainerwidget.h"

0
src/plugins/android/androidmanifesteditorwidget.h → src/plugins/android/androidmanifesteditor.h
View File

2
src/plugins/android/androidplugin.cpp
View File

@@ -7,7 +7,7 @@
#include "androiddebugsupport.h" #include "androiddebugsupport.h"
#include "androiddeployqtstep.h" #include "androiddeployqtstep.h"
#include "androiddevice.h" #include "androiddevice.h"
#include "androidmanifesteditorwidget.h" #include "androidmanifesteditor.h"
#include "androidpackageinstallationstep.h" #include "androidpackageinstallationstep.h"
#include "androidpotentialkit.h" #include "androidpotentialkit.h"
#include "androidqmltoolingsupport.h" #include "androidqmltoolingsupport.h"