diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt index f49e57ba58c..6048a5ecd76 100644 --- a/src/plugins/android/CMakeLists.txt +++ b/src/plugins/android/CMakeLists.txt @@ -3,7 +3,6 @@ add_qtc_plugin(Android PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport LanguageClient SOURCES android.qrc - android_global.h androidtr.h androidavdmanager.cpp androidavdmanager.h androidbuildapkstep.cpp androidbuildapkstep.h diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index 2baca19e0f2..a8fbd7c818a 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -17,7 +17,7 @@ Project { Depends { name: "Utils" } files: [ - "android_global.h", "androidtr.h", + "androidtr.h", "android.qrc", "androidavdmanager.cpp", "androidavdmanager.h", diff --git a/src/plugins/android/android_global.h b/src/plugins/android/android_global.h deleted file mode 100644 index 377e46f773f..00000000000 --- a/src/plugins/android/android_global.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2016 BogDan Vatra -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -#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 diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index f55dbd14559..e0d74c05222 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -4,7 +4,6 @@ #pragma once -#include "android_global.h" #include "androiddeviceinfo.h" #include "androidsdkmanager.h" #include "androidsdkpackage.h" @@ -56,7 +55,7 @@ public: bool containsVersion(const QVersionNumber &qtVersion) const; }; -class ANDROID_EXPORT AndroidConfig +class AndroidConfig { public: void load(const QSettings &settings); @@ -183,7 +182,7 @@ private: mutable QHash m_serialNumberToDeviceName; }; -class ANDROID_EXPORT AndroidConfigurations : public QObject +class AndroidConfigurations : public QObject { Q_OBJECT diff --git a/src/plugins/android/androidextralibrarylistmodel.h b/src/plugins/android/androidextralibrarylistmodel.h index 0d42d4d9602..6f236cb8eac 100644 --- a/src/plugins/android/androidextralibrarylistmodel.h +++ b/src/plugins/android/androidextralibrarylistmodel.h @@ -4,8 +4,6 @@ #pragma once -#include "android_global.h" - #include #include @@ -13,7 +11,7 @@ namespace ProjectExplorer { class BuildSystem; } namespace Android { -class ANDROID_EXPORT AndroidExtraLibraryListModel : public QAbstractItemModel +class AndroidExtraLibraryListModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index 9ad677aeef3..8652c4ddfc6 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -3,8 +3,6 @@ #pragma once -#include "android_global.h" - #include namespace Android { diff --git a/src/plugins/android/createandroidmanifestwizard.h b/src/plugins/android/createandroidmanifestwizard.h index e1552311317..4d5a309583f 100644 --- a/src/plugins/android/createandroidmanifestwizard.h +++ b/src/plugins/android/createandroidmanifestwizard.h @@ -3,8 +3,6 @@ #pragma once -#include "android_global.h" - #include #include