diff options
author | hjk <hjk@qt.io> | 2018-05-15 14:08:34 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-05-16 11:28:56 +0000 |
commit | 2dccf95e49aa70fa5281fbafa5d97a65f6e2821e (patch) | |
tree | a962615fb7ea4c2971a6a96c6f4a97fcdcca355e /src | |
parent | 9ff7664ec29fa77c89dc7ece1ed4ed7e72aad721 (diff) |
Android: Remove AndroidRunnable
Not used anymore.
Change-Id: Iad4fd894c389b310d11cac2fe49b96ded39b0677
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/android/android.pro | 2 | ||||
-rw-r--r-- | src/plugins/android/android.qbs | 2 | ||||
-rw-r--r-- | src/plugins/android/androidrunnable.cpp | 37 | ||||
-rw-r--r-- | src/plugins/android/androidrunnable.h | 53 | ||||
-rw-r--r-- | src/plugins/android/androidrunner.h | 1 |
5 files changed, 0 insertions, 95 deletions
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro index d26264df20..e17c7e284b 100644 --- a/src/plugins/android/android.pro +++ b/src/plugins/android/android.pro @@ -46,7 +46,6 @@ HEADERS += \ android_global.h \ androidbuildapkstep.h \ androidbuildapkwidget.h \ - androidrunnable.h \ androidtoolmanager.h \ androidsdkmanager.h \ androidavdmanager.h \ @@ -94,7 +93,6 @@ SOURCES += \ androidbuildapkstep.cpp \ androidbuildapkwidget.cpp \ androidqtsupport.cpp \ - androidrunnable.cpp \ androidtoolmanager.cpp \ androidsdkmanager.cpp \ androidavdmanager.cpp \ diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index 4b9ce0545e..b573d3883b 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -86,8 +86,6 @@ Project { "androidrunconfiguration.h", "androidruncontrol.cpp", "androidruncontrol.h", - "androidrunnable.cpp", - "androidrunnable.h", "androidrunner.cpp", "androidrunner.h", "androidrunnerworker.cpp", diff --git a/src/plugins/android/androidrunnable.cpp b/src/plugins/android/androidrunnable.cpp deleted file mode 100644 index ae70bd71dd..0000000000 --- a/src/plugins/android/androidrunnable.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "androidrunnable.h" - -namespace Android { - -void *AndroidRunnable::staticTypeId = &AndroidRunnable::staticTypeId; - -AndroidRunnable::AndroidRunnable() -{ - qRegisterMetaType<AndroidRunnable>("AndroidRunnable"); -} - -} // namespace Android diff --git a/src/plugins/android/androidrunnable.h b/src/plugins/android/androidrunnable.h deleted file mode 100644 index f64bd49c29..0000000000 --- a/src/plugins/android/androidrunnable.h +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include "android_global.h" -#include <projectexplorer/runnables.h> - -namespace Android { - -struct ANDROID_EXPORT AndroidRunnable -{ - AndroidRunnable(); - QString packageName; - - QString displayName() const { return packageName; } - static void *staticTypeId; -}; - -inline bool operator==(const AndroidRunnable &r1, const AndroidRunnable &r2) -{ - return r1.packageName == r2.packageName; -} - -inline bool operator!=(const AndroidRunnable &r1, const AndroidRunnable &r2) -{ - return !(r1 == r2); -} - -} // namespace Android -Q_DECLARE_METATYPE(Android::AndroidRunnable) diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index 2e26aedd60..3196df551a 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -26,7 +26,6 @@ #pragma once #include "androidconfigurations.h" -#include "androidrunnable.h" #include <projectexplorer/runconfiguration.h> #include <qmldebug/qmldebugcommandlinearguments.h> |