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

Android: Unexport Android plugin

Browse Source 
It doesn't seem that any class from this plugin is used outside.

Change-Id: I88a63e4c41cbd4b20f0de8bbd05668f55bafdc97
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2023-08-18 09:55:43 +02:00
parent 53f16e9b49
commit 201b28f362
7 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@ add_qtc_plugin(Android
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport LanguageClient PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport LanguageClient
SOURCES SOURCES
android.qrc android.qrc
android_global.h
androidtr.h androidtr.h
androidavdmanager.cpp androidavdmanager.h androidavdmanager.cpp androidavdmanager.h
androidbuildapkstep.cpp androidbuildapkstep.h androidbuildapkstep.cpp androidbuildapkstep.h

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

@@ -17,7 +17,7 @@ Project {
Depends { name: "Utils" } Depends { name: "Utils" }
files: [ files: [
"android_global.h", "androidtr.h", "androidtr.h",
"android.qrc", "android.qrc",
"androidavdmanager.cpp", "androidavdmanager.cpp",
"androidavdmanager.h", "androidavdmanager.h",

14
src/plugins/android/android_global.h
View File

@@ -1,14 +0,0 @@
// Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include <qglobal.h>
#if defined(ANDROID_LIBRARY)
# define ANDROID_EXPORT Q_DECL_EXPORT
#elif defined(ANDROID_STATIC_LIBRARY)
# define ANDROID_EXPORT
#else
# define ANDROID_EXPORT Q_DECL_IMPORT
#endif

5
src/plugins/android/androidconfigurations.h
View File

@@ -4,7 +4,6 @@
#pragma once #pragma once
#include "android_global.h"
#include "androiddeviceinfo.h" #include "androiddeviceinfo.h"
#include "androidsdkmanager.h" #include "androidsdkmanager.h"
#include "androidsdkpackage.h" #include "androidsdkpackage.h"
@@ -56,7 +55,7 @@ public:
bool containsVersion(const QVersionNumber &qtVersion) const; bool containsVersion(const QVersionNumber &qtVersion) const;
}; };
class ANDROID_EXPORT AndroidConfig class AndroidConfig
{ {
public: public:
void load(const QSettings &settings); void load(const QSettings &settings);
@@ -183,7 +182,7 @@ private:
mutable QHash<QString, QString> m_serialNumberToDeviceName; mutable QHash<QString, QString> m_serialNumberToDeviceName;
}; };
class ANDROID_EXPORT AndroidConfigurations : public QObject class AndroidConfigurations : public QObject
{ {
Q_OBJECT Q_OBJECT

4
src/plugins/android/androidextralibrarylistmodel.h
View File

@@ -4,8 +4,6 @@
#pragma once #pragma once
#include "android_global.h"
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QStringList> #include <QStringList>
@@ -13,7 +11,7 @@ namespace ProjectExplorer { class BuildSystem; }
namespace Android { namespace Android {
class ANDROID_EXPORT AndroidExtraLibraryListModel : public QAbstractItemModel class AndroidExtraLibraryListModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT

2
src/plugins/android/androidrunconfiguration.h
View File

@@ -3,8 +3,6 @@
#pragma once #pragma once
#include "android_global.h"
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
namespace Android { namespace Android {

2
src/plugins/android/createandroidmanifestwizard.h
View File

@@ -3,8 +3,6 @@
#pragma once #pragma once
#include "android_global.h"
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/wizard.h> #include <utils/wizard.h>