diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:13:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:14:15 +0100 |
| commit | 846cc4c75cc06def67e831c8cb3c9edaef24f8f0 (patch) | |
| tree | cf8cd76a5a610a6264583148b2c0549f7514dde3 /src/corelib/kernel/qjni_p.h | |
| parent | 9e4a215a2569a04010292c8718d0f0569bc06c12 (diff) | |
| parent | 0d0fb04d505d105fb4b2fc71d68f729ce670b12e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/network/access/qhttpthreaddelegate.cpp
Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91
Diffstat (limited to 'src/corelib/kernel/qjni_p.h')
| -rw-r--r-- | src/corelib/kernel/qjni_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qjni_p.h b/src/corelib/kernel/qjni_p.h index b1f0011b94..83dd3a00af 100644 --- a/src/corelib/kernel/qjni_p.h +++ b/src/corelib/kernel/qjni_p.h @@ -177,7 +177,7 @@ public: { jobject jobj = static_cast<jobject>(o); if (!isSameObject(jobj)) { - d = QSharedPointer<QJNIObjectData>(new QJNIObjectData()); + d = QSharedPointer<QJNIObjectData>::create(); if (jobj) { QJNIEnvironmentPrivate env; d->m_jobject = env->NewGlobalRef(jobj); |