diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-09 09:34:09 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:05 +0200 |
commit | 969f1f80bf255498abbec6886d443670c20a79c8 (patch) | |
tree | 45a65f19da61868c2fe71669fb4b7d29b374edac /recipes-qt/qt5/qtdeclarative | |
parent | 648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff) |
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
* QtWebEngine now requires gcc-multilib to be installed on the host
system, because the host tools are built to the same bitness as
the target (arm -> x86, aarch64 -> x86-64)
* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbase
https://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch | 44 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch | 84 |
2 files changed, 0 insertions, 128 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch deleted file mode 100644 index 423681ee..00000000 --- a/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 80e63c5a2981473dd7ee3a4f382e54948bb99f75 Mon Sep 17 00:00:00 2001 -From: Gunnar Sletta <gunnar@crimson.no> -Date: Thu, 19 Jan 2017 09:05:46 +0100 -Subject: [PATCH 2/3] Fix memory leak in V4 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Transitions contain both an id and a set of flags, but the sorting -failed to take the flags into account in the operator<. As a result -we would some times end up with duplicate entries if the same id -was added multiple times with different flags. - -If the same id was added again and again with varying flags, this -could lead to an ever expanding list filled with duplicate entries. - -Fix this by also taking flags into account in operator< so that -operator< and operator== are symetric and the list gets correctly -sorted. - -Change-Id: I762ec3f0c5b4ed9a1aecb9a883187a0445491591 -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> -Reviewed-by: Robin Burchell <robin.burchell@crimson.no> -Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> ---- - src/qml/jsruntime/qv4internalclass_p.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h -index dcda949..1d8ef4b 100644 ---- a/src/qml/jsruntime/qv4internalclass_p.h -+++ b/src/qml/jsruntime/qv4internalclass_p.h -@@ -234,7 +234,7 @@ struct InternalClassTransition - { return id == other.id && flags == other.flags; } - - bool operator<(const InternalClassTransition &other) const -- { return id < other.id; } -+ { return id < other.id || (id == other.id && flags < other.flags); } - }; - - struct InternalClass : public QQmlJS::Managed { --- -2.9.3 - diff --git a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch b/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch deleted file mode 100644 index 79a48f54..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 6aa9001064c19e75e58c830eedc583e2342a7f20 Mon Sep 17 00:00:00 2001 -From: Shawn Rutledge <shawn.rutledge@qt.io> -Date: Wed, 1 Feb 2017 12:06:26 +0100 -Subject: [PATCH 3/3] fix memory leak in - QQuickWindowPrivate::deliverTouchAsMouse -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A QTouchEvent is allocated with a reduced subset of TouchPoints for -each Item to which we attempt to deliver it, and thrown away afterwards. -(Ιt's not efficient to heap-allocate it, but we can't avoid doing it -at all without changing behavior.) So now it's stored in a QScopedPointer. - -Change-Id: I48badb493610d0a715e582a2eedae95e2006eb2b -Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> -Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> ---- - src/quick/items/qquickwindow.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp -index 1297dde..c130aec 100644 ---- a/src/quick/items/qquickwindow.cpp -+++ b/src/quick/items/qquickwindow.cpp -@@ -629,8 +629,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - - // FIXME: make this work for mouse events too and get rid of the asTouchEvent in here. - Q_ASSERT(pointerEvent->asPointerTouchEvent()); -- QTouchEvent *event = pointerEvent->asPointerTouchEvent()->touchEventForItem(item); -- if (!event) -+ QScopedPointer<QTouchEvent> event(pointerEvent->asPointerTouchEvent()->touchEventForItem(item)); -+ if (event.isNull()) - return false; - - // For each point, check if it is accepted, if not, try the next point. -@@ -647,7 +647,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - break; - - qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item; -- QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false)); -+ QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event.data(), item, false)); - - // Send a single press and see if that's accepted - QCoreApplication::sendEvent(item, mousePress.data()); -@@ -661,7 +661,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - pointerEventPoint->setGrabber(item); - - if (checkIfDoubleClicked(event->timestamp())) { -- QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false)); -+ QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event.data(), item, false)); - QCoreApplication::sendEvent(item, mouseDoubleClick.data()); - event->setAccepted(mouseDoubleClick->isAccepted()); - if (!mouseDoubleClick->isAccepted()) { -@@ -678,7 +678,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - } else if (touchMouseDevice == device && p.id() == touchMouseId) { - if (p.state() & Qt::TouchPointMoved) { - if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { -- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, mouseGrabberItem, false)); -+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), mouseGrabberItem, false)); - QCoreApplication::sendEvent(item, me.data()); - event->setAccepted(me->isAccepted()); - if (me->isAccepted()) { -@@ -689,7 +689,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - // no grabber, check if we care about mouse hover - // FIXME: this should only happen once, not recursively... I'll ignore it just ignore hover now. - // hover for touch??? -- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, item, false)); -+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), item, false)); - if (lastMousePosition.isNull()) - lastMousePosition = me->windowPos(); - QPointF last = lastMousePosition; -@@ -707,7 +707,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve - } else if (p.state() & Qt::TouchPointReleased) { - // currently handled point was released - if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { -- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event, mouseGrabberItem, false)); -+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event.data(), mouseGrabberItem, false)); - QCoreApplication::sendEvent(item, me.data()); - - if (item->acceptHoverEvents() && p.screenPos() != QGuiApplicationPrivate::lastCursorPosition) { --- -2.9.3 - |