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

Android: Remove AndroidRunnable

Browse Source 
Not used anymore.

Change-Id: Iad4fd894c389b310d11cac2fe49b96ded39b0677
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2018-05-15 14:08:34 +02:00
parent 9ff7664ec2
commit 2dccf95e49
5 changed files with 0 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,6 @@ HEADERS += \
android_global.h \ android_global.h \
androidbuildapkstep.h \ androidbuildapkstep.h \
androidbuildapkwidget.h \ androidbuildapkwidget.h \
androidrunnable.h \
androidtoolmanager.h \ androidtoolmanager.h \
androidsdkmanager.h \ androidsdkmanager.h \
androidavdmanager.h \ androidavdmanager.h \
@@ -94,7 +93,6 @@ SOURCES += \
androidbuildapkstep.cpp \ androidbuildapkstep.cpp \
androidbuildapkwidget.cpp \ androidbuildapkwidget.cpp \
androidqtsupport.cpp \ androidqtsupport.cpp \
androidrunnable.cpp \
androidtoolmanager.cpp \ androidtoolmanager.cpp \
androidsdkmanager.cpp \ androidsdkmanager.cpp \
androidavdmanager.cpp \ androidavdmanager.cpp \

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

@@ -86,8 +86,6 @@ Project {
"androidrunconfiguration.h", "androidrunconfiguration.h",
"androidruncontrol.cpp", "androidruncontrol.cpp",
"androidruncontrol.h", "androidruncontrol.h",
"androidrunnable.cpp",
"androidrunnable.h",
"androidrunner.cpp", "androidrunner.cpp",
"androidrunner.h", "androidrunner.h",
"androidrunnerworker.cpp", "androidrunnerworker.cpp",

37
src/plugins/android/androidrunnable.cpp
View File

@@ -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

53
src/plugins/android/androidrunnable.h
View File

@@ -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)

1
src/plugins/android/androidrunner.h
View File

@@ -26,7 +26,6 @@
#pragma once #pragma once
#include "androidconfigurations.h" #include "androidconfigurations.h"
#include "androidrunnable.h"
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <qmldebug/qmldebugcommandlinearguments.h> #include <qmldebug/qmldebugcommandlinearguments.h>