From 106061ee65e8675fbee6a1db95da855db6a16662 Mon Sep 17 00:00:00 2001 From: Svenn-Arne Dragly Date: Wed, 27 Sep 2017 13:38:50 +0200 Subject: Make m_pressAndHoldTimer into a raw pointer to avoid deleting it twice The timer is parented to the QMouseHandler (introduced in 595b4add0ce6f32bb8ffc56b3a59e6e5bf0b000a) and was therefore deleted both by the parent and by the QScopedPointer, leading to crash on exit. This commit removes the QScopedPointer and uses a raw pointer instead. Task-number: QTBUG-63462 Change-Id: I6b031caf7cb69ccbde74995661f4ce8c73f21d88 Reviewed-by: Sean Harmer --- src/input/frontend/qmousehandler.cpp | 2 +- src/input/frontend/qmousehandler_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 9f30810a9..895cbc49a 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -60,7 +60,7 @@ QMouseHandlerPrivate::QMouseHandlerPrivate() m_shareable = false; m_pressAndHoldTimer->setSingleShot(true); m_pressAndHoldTimer->setInterval(500); - QObject::connect(m_pressAndHoldTimer.data(), &QTimer::timeout, [this] { + QObject::connect(m_pressAndHoldTimer, &QTimer::timeout, [this] { emit q_func()->pressAndHold(m_lastPressedEvent.data()); }); } diff --git a/src/input/frontend/qmousehandler_p.h b/src/input/frontend/qmousehandler_p.h index 3b2f2284d..6c7f8b204 100644 --- a/src/input/frontend/qmousehandler_p.h +++ b/src/input/frontend/qmousehandler_p.h @@ -74,7 +74,7 @@ public: QMouseDevice *m_mouseDevice; bool m_containsMouse; - QScopedPointer m_pressAndHoldTimer; + QTimer *m_pressAndHoldTimer = nullptr; QMouseEventPtr m_lastPressedEvent; void mouseEvent(const QMouseEventPtr &event); -- cgit v1.2.3 From 143b721249af92fc27f48fb01914195516f7a087 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 22 Sep 2017 09:03:55 +0300 Subject: Add changes file for Qt 5.9.2 Change-Id: I87e8292ee606af33f729e2b492a616325a49c89a Reviewed-by: Sean Harmer --- dist/changes-5.9.2 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 dist/changes-5.9.2 diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 new file mode 100644 index 000000000..d8e1cb493 --- /dev/null +++ b/dist/changes-5.9.2 @@ -0,0 +1,39 @@ +Qt 5.9.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.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/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.2 Changes * +**************************************************************************** + +- Don't crash when removing clip animators +- Case-insensitive matching of DDS/PKM files [QTBUG-61760] +- Fix crash when using a single key frame +- Fix rendering glitches with 2D text +- Respect render target selector when reading pixel data back [QTBUG-61547] +- Fix memory leaks when loading multiple scenes with assimp [QTBUG-61856] +- Fix updates of some render states +- Fix sorting of render commands [QTBUG-60183] +- Fix assert crash when updating 3D content of a Scene3D item [QTBUG-60613] +- Fix crash when loading multiple assimp scenes +- Fix shader compilation on Rasp-Pi [QTBUG-59349] +- Don't deref null VAOs [QTBUG-59349] +- Respect byteStride in QAttribute +- Don't crash when rapidly changing textures +- Ignore ill-formed faces in OBJ files +- Many performance and memory use reduction changes -- cgit v1.2.3