diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:22:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:22:31 +0200 |
commit | 368b0bbf2b2854547cfafa7092361f09dd157fb1 (patch) | |
tree | 48b08c5912271c1ca9a4364a4dfdd984bb083653 | |
parent | 80d6ea6cac5ece4e3053ec19810abceb77feb4da (diff) | |
parent | d08a073fffabb1e8629145b1b2114314ef01dcff (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I3d3f2f84808ca29a056783873dd78094a53c2875
-rw-r--r-- | dist/changes-5.6.0 | 22 | ||||
-rw-r--r-- | examples/androidextras/notification/android-sources/res/drawable/icon.png | bin | 3953 -> 3264 bytes | |||
-rw-r--r-- | examples/androidextras/notification/images/happy.png | bin | 2804 -> 1767 bytes | |||
-rw-r--r-- | examples/androidextras/notification/images/sad.png | bin | 2447 -> 1262 bytes | |||
-rw-r--r-- | src/androidextras/android/qandroidfunctions.h | 4 | ||||
-rw-r--r-- | src/androidextras/doc/images/notification.png | bin | 26373 -> 23282 bytes | |||
-rw-r--r-- | src/androidextras/jni/qandroidjniobject.cpp | 6 | ||||
-rw-r--r-- | src/androidextras/jni/qandroidjniobject.h | 6 |
8 files changed, 31 insertions, 7 deletions
diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0 new file mode 100644 index 0000000..f9e7e75 --- /dev/null +++ b/dist/changes-5.6.0 @@ -0,0 +1,22 @@ +Qt 5.6 introduces many new features and improvements as well as bugfixes +over the 5.5.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.6 + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + - This release contains only minor improvements. + diff --git a/examples/androidextras/notification/android-sources/res/drawable/icon.png b/examples/androidextras/notification/android-sources/res/drawable/icon.png Binary files differindex e870213..035c600 100644 --- a/examples/androidextras/notification/android-sources/res/drawable/icon.png +++ b/examples/androidextras/notification/android-sources/res/drawable/icon.png diff --git a/examples/androidextras/notification/images/happy.png b/examples/androidextras/notification/images/happy.png Binary files differindex d1c1460..fd31f8d 100644 --- a/examples/androidextras/notification/images/happy.png +++ b/examples/androidextras/notification/images/happy.png diff --git a/examples/androidextras/notification/images/sad.png b/examples/androidextras/notification/images/sad.png Binary files differindex 00026bd..74e8f8f 100644 --- a/examples/androidextras/notification/images/sad.png +++ b/examples/androidextras/notification/images/sad.png diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h index 862b55c..d86fe92 100644 --- a/src/androidextras/android/qandroidfunctions.h +++ b/src/androidextras/android/qandroidfunctions.h @@ -60,10 +60,10 @@ namespace QtAndroid Q_ANDROIDEXTRAS_EXPORT void startIntentSender(const QAndroidJniObject &intentSender, int receiverRequestCode, - QAndroidActivityResultReceiver *resultReceiver = 0); + QAndroidActivityResultReceiver *resultReceiver = nullptr); Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidJniObject &intent, int receiverRequestCode, - QAndroidActivityResultReceiver *resultReceiver = 0); + QAndroidActivityResultReceiver *resultReceiver = nullptr); typedef std::function<void()> Runnable; Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThread(const Runnable &runnable); diff --git a/src/androidextras/doc/images/notification.png b/src/androidextras/doc/images/notification.png Binary files differindex 4ba7818..89784ea 100644 --- a/src/androidextras/doc/images/notification.png +++ b/src/androidextras/doc/images/notification.png diff --git a/src/androidextras/jni/qandroidjniobject.cpp b/src/androidextras/jni/qandroidjniobject.cpp index bca9487..9624489 100644 --- a/src/androidextras/jni/qandroidjniobject.cpp +++ b/src/androidextras/jni/qandroidjniobject.cpp @@ -318,10 +318,12 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QAndroidJniObject::~QAndroidJniObject() - Destroys the QAndroidJniObject and releases any references held by the QAndroidJniObject. */ +QAndroidJniObject::~QAndroidJniObject() +{ + // must be empty until ### Qt 6 +} /*! \fn T QAndroidJniObject::callMethod(const char *methodName, const char *signature, ...) const diff --git a/src/androidextras/jni/qandroidjniobject.h b/src/androidextras/jni/qandroidjniobject.h index 12d3b11..94bd901 100644 --- a/src/androidextras/jni/qandroidjniobject.h +++ b/src/androidextras/jni/qandroidjniobject.h @@ -54,11 +54,11 @@ class Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject public: QAndroidJniObject(); explicit QAndroidJniObject(const char *className); - QAndroidJniObject(const char *className, const char *sig, ...); + explicit QAndroidJniObject(const char *className, const char *sig, ...); explicit QAndroidJniObject(jclass clazz); - QAndroidJniObject(jclass clazz, const char *sig, ...); + explicit QAndroidJniObject(jclass clazz, const char *sig, ...); QAndroidJniObject(jobject obj); - ~QAndroidJniObject() { } + ~QAndroidJniObject(); template <typename T> inline T object() const { return static_cast<T>(javaObject()); } |