diff options
author | Christian Strømme <christian.stromme@digia.com> | 2013-09-25 12:06:03 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 01:02:04 +0200 |
commit | 6500083ceb9c9e63eb5ff544e91aa9d556c6739f (patch) | |
tree | b4d78a732f891e63487839b284b7f7fe3a0f12ed | |
parent | 2b81ca83860eab49b946d43f851e936c5a6e3092 (diff) |
Remove JNI_OnLoad() from the example.v5.2.0-alpha1
We use the class loader to get the files
Change-Id: I5268dbda5f17c1dfc7332fec35e6da033090605f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 files changed, 3 insertions, 135 deletions
diff --git a/examples/androidextras/notification/androidjnibindings.cpp b/examples/androidextras/notification/androidjnibindings.cpp deleted file mode 100644 index 98280c2..0000000 --- a/examples/androidextras/notification/androidjnibindings.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWinExtras module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "androidjnibindings.h" - -jint JNICALL JNI_OnLoad(JavaVM *vm, void *) -{ - JNIEnv *env; - if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_4) != JNI_OK) { - qFatal("Couldn't initialize environment!"); - return -1; - } - - AndroidJNIBindings::detectNotificationClientClass(env); - - return JNI_VERSION_1_4; -} - -jclass AndroidJNIBindings::m_notificationClientClass = 0; -void AndroidJNIBindings::detectNotificationClientClass(JNIEnv *environment) -{ - jclass clazz = environment->FindClass("org/qtproject/example/notification/NotificationClient"); - if (clazz == 0) { - environment->ExceptionDescribe(); - environment->ExceptionClear(); - return; - } - - m_notificationClientClass = reinterpret_cast<jclass>(environment->NewGlobalRef(clazz)); -} diff --git a/examples/androidextras/notification/androidjnibindings.h b/examples/androidextras/notification/androidjnibindings.h deleted file mode 100644 index 64cca54..0000000 --- a/examples/androidextras/notification/androidjnibindings.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWinExtras module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ANDROIDJNIBINDINGS_H -#define ANDROIDJNIBINDINGS_H - -#include <QtAndroidExtras/QJNIObject> - -class AndroidJNIBindings -{ -public: - static jclass notificationClientClass() - { - return m_notificationClientClass; - } - - static void detectNotificationClientClass(JNIEnv *environment); - -private: - static jclass m_notificationClientClass; -}; - -#endif // ANDROIDJNIBINDINGS_H diff --git a/examples/androidextras/notification/notification.pro b/examples/androidextras/notification/notification.pro index 9d57ca3..8459599 100644 --- a/examples/androidextras/notification/notification.pro +++ b/examples/androidextras/notification/notification.pro @@ -8,8 +8,7 @@ ANDROID_APP_NAME = Qt Notifier SOURCES += \ main.cpp \ - notificationclient.cpp \ - androidjnibindings.cpp + notificationclient.cpp OTHER_FILES += \ qml/main.qml \ @@ -20,5 +19,4 @@ RESOURCES += \ main.qrc HEADERS += \ - notificationclient.h \ - androidjnibindings.h + notificationclient.h diff --git a/examples/androidextras/notification/notificationclient.cpp b/examples/androidextras/notification/notificationclient.cpp index d9cbf84..f48c401 100644 --- a/examples/androidextras/notification/notificationclient.cpp +++ b/examples/androidextras/notification/notificationclient.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "notificationclient.h" -#include "androidjnibindings.h" #include <QtAndroidExtras/QJNIObject> @@ -67,7 +66,7 @@ QString NotificationClient::notification() const void NotificationClient::updateAndroidNotification() { QJNIObject javaNotification = QJNIObject::fromString(m_notification); - QJNIObject::callStaticMethod<void>(AndroidJNIBindings::notificationClientClass(), + QJNIObject::callStaticMethod<void>("org/qtproject/example/notification/NotificationClient", "notify", "(Ljava/lang/String;)V", javaNotification.object<jstring>()); |