diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2013-10-08 17:43:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-09 18:22:38 +0200 |
| commit | c5b2553fc27bb96836795142263aa52c31031916 (patch) | |
| tree | 4ef53b6bcda952487beefad0c35f7070693d4c1f /src/corelib/kernel/qjni_p.h | |
| parent | 85fc94db1bb2189ea379033aec23b1779b809cc0 (diff) | |
Android: Add QAndroidJniXxx as friend classes in qjni.
The JNI classes in Qt Android Extras are changing name from QJNIXxx to
QAndroidJniXxx and they need to be friends of the private JNI classes
in core.
Change-Id: Ib5e1729f4bbba876b7d3eba5742fe750f95c48f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qjni_p.h')
| -rw-r--r-- | src/corelib/kernel/qjni_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qjni_p.h b/src/corelib/kernel/qjni_p.h index 3f8f9ff603..c5bbae26b9 100644 --- a/src/corelib/kernel/qjni_p.h +++ b/src/corelib/kernel/qjni_p.h @@ -68,7 +68,7 @@ public: operator JNIEnv*() const; private: - friend class QJNIEnvironment; + friend class QAndroidJniEnvironment; Q_DISABLE_COPY(QJNIEnvironmentPrivate) JNIEnv *jniEnv; }; @@ -187,7 +187,7 @@ public: } private: - friend class QJNIObject; + friend class QAndroidJniObject; QJNIObjectPrivate(const char *className, const char *sig, va_list args); QJNIObjectPrivate(jclass clazz, const char *sig, va_list args); |