From b08c3e69e3e82014b0f16b1ff94e5edd31d5c2c6 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 20 May 2016 10:45:25 +0200 Subject: Add changelog for Qt 5.6.1 release of QtSensors Change-Id: I378943bd0ce89689b43eee4971a306c6f73fcb10 Reviewed-by: Leena Miettinen --- dist/changes-5.6.1 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 dist/changes-5.6.1 diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 new file mode 100644 index 0000000..fce6ffc --- /dev/null +++ b/dist/changes-5.6.1 @@ -0,0 +1,29 @@ +Qt 5.6.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +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. + +**************************************************************************** +* Library * +**************************************************************************** + +QtSensors +--------- + + - Fixed a few documentation issues + - Reduced size of PNGs in documentation and examples + - Cleaned up various project files across the module -- cgit v1.2.1 From cd1fc0b6ed27906c15b8f0e7f7e1b8cab147a3c3 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 20 May 2016 14:47:09 +0200 Subject: QCoverSensorGestureRecognizer: sanitize initialization. Coverity noticed uninitialized members (CID 22309). Eliminate members handler (never accessed or set; the code always uses QtSensorGestureSensorHandler::instance() instead) and lastTs (set but never accessed). Initialized timer (to 0; it'll be set more sensibly as long as create() gets called). Reformatted constructor. Change-Id: I41738ec51db94fb35e068af509e9a34bf9221770 Reviewed-by: Lorn Potter --- .../qtsensors/qcoversensorgesturerecognizer.cpp | 11 +++++++---- .../sensorgestures/qtsensors/qcoversensorgesturerecognizer.h | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp index ba01004..5b846c5 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp @@ -36,9 +36,13 @@ QT_BEGIN_NAMESPACE -QCoverSensorGestureRecognizer::QCoverSensorGestureRecognizer(QObject *parent) : - QSensorGestureRecognizer(parent), - orientationReading(0), proximityReading(0),active(0), detecting(0) +QCoverSensorGestureRecognizer::QCoverSensorGestureRecognizer(QObject *parent) + : QSensorGestureRecognizer(parent), + orientationReading(0), + proximityReading(0), + timer(0), + active(0), + detecting(0) { } @@ -114,7 +118,6 @@ void QCoverSensorGestureRecognizer::proximityChanged(QProximityReading *reading) detecting = true; } } - lastTs = reading->timestamp(); } void QCoverSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h index 3425ba3..220e83a 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h @@ -70,10 +70,8 @@ private: bool proximityReading; QTimer *timer; - QtSensorGestureSensorHandler *handler; bool active; bool detecting; - qreal lastTs; }; QT_END_NAMESPACE -- cgit v1.2.1 From 79d3d49c4c4bf1d07f377d24d8c6e571abe80355 Mon Sep 17 00:00:00 2001 From: Ralf Nolden Date: Sat, 28 May 2016 13:30:33 +0200 Subject: OpenBSD: librt.so is not available on system OpenBSD does not provide librt.so for the sensors module, which leads to linker errors in this case. Disable linking to librt.so by adding !openbsd to the list of OSes not having it. Change-Id: If7b33eb33b4027be79bce4bb3272bef3a5b7d832 Reviewed-by: Thiago Macieira --- src/plugins/sensors/dummy/dummy.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro index b4ef2fd..6eab491 100644 --- a/src/plugins/sensors/dummy/dummy.pro +++ b/src/plugins/sensors/dummy/dummy.pro @@ -12,7 +12,7 @@ SOURCES += dummycommon.cpp\ OTHER_FILES = plugin.json -unix:!mac:!qnx:!android:LIBS+=-lrt +unix:!darwin:!qnx:!android:!openbsd: LIBS += -lrt PLUGIN_TYPE = sensors PLUGIN_CLASS_NAME = dummySensorPlugin -- cgit v1.2.1 From 90eb1a41702bf748ac3f356d8ce04496f75ecb64 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 15 Jun 2016 08:38:36 +0800 Subject: Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I318af27c165bdb2c1f9e8cc71814547e7d6b23da Reviewed-by: Lorn Potter --- LICENSE.GPLv2 | 2 +- LICENSE.GPLv3 | 2 +- LICENSE.LGPLv21 | 2 +- LICENSE.LGPLv3 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 6dbb032..a424477 100644 --- a/LICENSE.GPLv2 +++ b/LICENSE.GPLv2 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU General Public License version 2, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b12..71c4ad4 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3. That license references the General Public License version 3, that is displayed below. Other portions of the Qt Toolkit may be licensed directly under this license. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 6e18461..dfcab5e 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 4d67bac..6bf924c 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. This license makes reference to the version 3 of the GNU General Public License, which you can find in the LICENSE.GPLv3 file. -- cgit v1.2.1 From 8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 20 Jul 2016 15:51:07 +0300 Subject: Make sure JNI_OnLoad is not called more than once Since Android 5.0 Google introduce a nasty bug[1] which calls JNI_OnLoad more than once. Basically every time when a library is loaded JNI_OnLoad is called if found, but it calls *again* JNI_OnLoad of its .so dependencies! [1] Workaround https://code.google.com/p/android/issues/detail?id=215069 Change-Id: I34728572bc279581b8c95c42c206ed104bfc09a5 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/sensors/android/src/androidjnisensors.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/sensors/android/src/androidjnisensors.cpp b/src/plugins/sensors/android/src/androidjnisensors.cpp index 98f408a..ce69e75 100644 --- a/src/plugins/sensors/android/src/androidjnisensors.cpp +++ b/src/plugins/sensors/android/src/androidjnisensors.cpp @@ -241,6 +241,11 @@ static bool registerNatives(JNIEnv *env) Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + typedef union { JNIEnv *nativeEnvironment; void *venv; -- cgit v1.2.1