From c2ca28adc0e821427072d86cbb4fbc27a39d1302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Wed, 24 Feb 2016 12:02:10 +0100 Subject: Add changelog for 5.6.0 Change-Id: Ibb50ac81d3ea84e0c66e17a1400fc119f24917ab Reviewed-by: Eskil Abrahamsen Blomfeldt --- dist/changes-5.6.0 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 dist/changes-5.6.0 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. + -- cgit v1.2.3 From 42e9499e3d9c56e06bee82ccfd6ebfadd2d1f91e Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 Feb 2016 13:45:47 +0100 Subject: Purge sRGB chunks from PNGs in examples. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I3ab25a8abccb130e4b419be6007e743f45f86fa2 Reviewed-by: Topi Reiniö --- .../android-sources/res/drawable/icon.png | Bin 3953 -> 3264 bytes examples/androidextras/notification/images/happy.png | Bin 2804 -> 1767 bytes examples/androidextras/notification/images/sad.png | Bin 2447 -> 1262 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/examples/androidextras/notification/android-sources/res/drawable/icon.png b/examples/androidextras/notification/android-sources/res/drawable/icon.png index e870213..035c600 100644 Binary files a/examples/androidextras/notification/android-sources/res/drawable/icon.png and b/examples/androidextras/notification/android-sources/res/drawable/icon.png differ diff --git a/examples/androidextras/notification/images/happy.png b/examples/androidextras/notification/images/happy.png index d1c1460..fd31f8d 100644 Binary files a/examples/androidextras/notification/images/happy.png and b/examples/androidextras/notification/images/happy.png differ diff --git a/examples/androidextras/notification/images/sad.png b/examples/androidextras/notification/images/sad.png index 00026bd..74e8f8f 100644 Binary files a/examples/androidextras/notification/images/sad.png and b/examples/androidextras/notification/images/sad.png differ -- cgit v1.2.3 From 965e83dad1f9219220b14bb3fe6e6e2b4c27d667 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 22 Mar 2016 11:16:39 +0100 Subject: Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I26201944b21d83f78c9e1c75cbd55334cd16359f Task-number: QTBUG-45291 Reviewed-by: BogDan Vatra --- src/androidextras/android/qandroidfunctions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h index 0bf2d20..2025b5f 100644 --- a/src/androidextras/android/qandroidfunctions.h +++ b/src/androidextras/android/qandroidfunctions.h @@ -51,10 +51,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); } -- cgit v1.2.3 From 8676559bee9c849a6e1950b786da59eaafd2b1cc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 22 Mar 2016 11:19:12 +0100 Subject: De-inline ~QAndroidJniObject() dtor By making the destructor (usually the first non-inline, non-pure, virtual function, and therefore the trigger for most compilers to emit the vtable and type_info structures for the class in that TU) out-of-line, vtables and, more importantly, type_info strucures for the class are pinned to a single TU. This prevents false negative dynamic_cast and catch evaluation. Since it is already exported, users of the class are unaffected by the change, but since it's public API, and the dtors may have been de-virtualized and inlined into application code, we need to avoid adding code to the out-of-line dtor until Qt 6. Task-number: QTBUG-45582 Change-Id: I60273f7352be0d5a45a94828647d61f0ec9f1d79 Reviewed-by: Christian Stromme --- src/androidextras/jni/qandroidjniobject.cpp | 6 ++++-- src/androidextras/jni/qandroidjniobject.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/androidextras/jni/qandroidjniobject.cpp b/src/androidextras/jni/qandroidjniobject.cpp index ebdd73d..2daed68 100644 --- a/src/androidextras/jni/qandroidjniobject.cpp +++ b/src/androidextras/jni/qandroidjniobject.cpp @@ -310,10 +310,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 c4922d5..73fa68a 100644 --- a/src/androidextras/jni/qandroidjniobject.h +++ b/src/androidextras/jni/qandroidjniobject.h @@ -52,7 +52,7 @@ public: explicit QAndroidJniObject(jclass clazz); QAndroidJniObject(jclass clazz, const char *sig, ...); QAndroidJniObject(jobject obj); - ~QAndroidJniObject() { } + ~QAndroidJniObject(); template inline T object() const { return static_cast(javaObject()); } -- cgit v1.2.3 From 0a1697302c15c0911bd2c78da3cd47a4006fe5f8 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 22 Mar 2016 11:24:23 +0100 Subject: Make more ctors explicit Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. This change only affects C++11. Change-Id: I01ef7f6c26c8087e8516c9d66067060a6ed7c020 Reviewed-by: Christian Stromme --- src/androidextras/jni/qandroidjniobject.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/androidextras/jni/qandroidjniobject.h b/src/androidextras/jni/qandroidjniobject.h index 73fa68a..e52c9f7 100644 --- a/src/androidextras/jni/qandroidjniobject.h +++ b/src/androidextras/jni/qandroidjniobject.h @@ -48,9 +48,9 @@ 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(); -- cgit v1.2.3 From d08a073fffabb1e8629145b1b2114314ef01dcff Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 Feb 2016 13:45:47 +0100 Subject: Purge sRGB chunks from PNG in documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subjects a *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: Ief67f8ca4dfc44655af62e70c10cb623acf83642 Reviewed-by: Topi Reiniö --- src/androidextras/doc/images/notification.png | Bin 26373 -> 23282 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/androidextras/doc/images/notification.png b/src/androidextras/doc/images/notification.png index 4ba7818..89784ea 100644 Binary files a/src/androidextras/doc/images/notification.png and b/src/androidextras/doc/images/notification.png differ -- cgit v1.2.3