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) | |
download | meta-qt5-969f1f80bf255498abbec6886d443670c20a79c8.tar.gz |
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 @@ | |||
1 | From 80e63c5a2981473dd7ee3a4f382e54948bb99f75 Mon Sep 17 00:00:00 2001 | ||
2 | From: Gunnar Sletta <gunnar@crimson.no> | ||
3 | Date: Thu, 19 Jan 2017 09:05:46 +0100 | ||
4 | Subject: [PATCH 2/3] Fix memory leak in V4 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Transitions contain both an id and a set of flags, but the sorting | ||
10 | failed to take the flags into account in the operator<. As a result | ||
11 | we would some times end up with duplicate entries if the same id | ||
12 | was added multiple times with different flags. | ||
13 | |||
14 | If the same id was added again and again with varying flags, this | ||
15 | could lead to an ever expanding list filled with duplicate entries. | ||
16 | |||
17 | Fix this by also taking flags into account in operator< so that | ||
18 | operator< and operator== are symetric and the list gets correctly | ||
19 | sorted. | ||
20 | |||
21 | Change-Id: I762ec3f0c5b4ed9a1aecb9a883187a0445491591 | ||
22 | Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> | ||
23 | Reviewed-by: Robin Burchell <robin.burchell@crimson.no> | ||
24 | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> | ||
25 | --- | ||
26 | src/qml/jsruntime/qv4internalclass_p.h | 2 +- | ||
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h | ||
30 | index dcda949..1d8ef4b 100644 | ||
31 | --- a/src/qml/jsruntime/qv4internalclass_p.h | ||
32 | +++ b/src/qml/jsruntime/qv4internalclass_p.h | ||
33 | @@ -234,7 +234,7 @@ struct InternalClassTransition | ||
34 | { return id == other.id && flags == other.flags; } | ||
35 | |||
36 | bool operator<(const InternalClassTransition &other) const | ||
37 | - { return id < other.id; } | ||
38 | + { return id < other.id || (id == other.id && flags < other.flags); } | ||
39 | }; | ||
40 | |||
41 | struct InternalClass : public QQmlJS::Managed { | ||
42 | -- | ||
43 | 2.9.3 | ||
44 | |||
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 @@ | |||
1 | From 6aa9001064c19e75e58c830eedc583e2342a7f20 Mon Sep 17 00:00:00 2001 | ||
2 | From: Shawn Rutledge <shawn.rutledge@qt.io> | ||
3 | Date: Wed, 1 Feb 2017 12:06:26 +0100 | ||
4 | Subject: [PATCH 3/3] fix memory leak in | ||
5 | QQuickWindowPrivate::deliverTouchAsMouse | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | A QTouchEvent is allocated with a reduced subset of TouchPoints for | ||
11 | each Item to which we attempt to deliver it, and thrown away afterwards. | ||
12 | (Ιt's not efficient to heap-allocate it, but we can't avoid doing it | ||
13 | at all without changing behavior.) So now it's stored in a QScopedPointer. | ||
14 | |||
15 | Change-Id: I48badb493610d0a715e582a2eedae95e2006eb2b | ||
16 | Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> | ||
17 | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> | ||
18 | --- | ||
19 | src/quick/items/qquickwindow.cpp | 14 +++++++------- | ||
20 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
21 | |||
22 | diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp | ||
23 | index 1297dde..c130aec 100644 | ||
24 | --- a/src/quick/items/qquickwindow.cpp | ||
25 | +++ b/src/quick/items/qquickwindow.cpp | ||
26 | @@ -629,8 +629,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve | ||
27 | |||
28 | // FIXME: make this work for mouse events too and get rid of the asTouchEvent in here. | ||
29 | Q_ASSERT(pointerEvent->asPointerTouchEvent()); | ||
30 | - QTouchEvent *event = pointerEvent->asPointerTouchEvent()->touchEventForItem(item); | ||
31 | - if (!event) | ||
32 | + QScopedPointer<QTouchEvent> event(pointerEvent->asPointerTouchEvent()->touchEventForItem(item)); | ||
33 | + if (event.isNull()) | ||
34 | return false; | ||
35 | |||
36 | // For each point, check if it is accepted, if not, try the next point. | ||
37 | @@ -647,7 +647,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve | ||
38 | break; | ||
39 | |||
40 | qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item; | ||
41 | - QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false)); | ||
42 | + QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event.data(), item, false)); | ||
43 | |||
44 | // Send a single press and see if that's accepted | ||
45 | QCoreApplication::sendEvent(item, mousePress.data()); | ||
46 | @@ -661,7 +661,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve | ||
47 | pointerEventPoint->setGrabber(item); | ||
48 | |||
49 | if (checkIfDoubleClicked(event->timestamp())) { | ||
50 | - QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false)); | ||
51 | + QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event.data(), item, false)); | ||
52 | QCoreApplication::sendEvent(item, mouseDoubleClick.data()); | ||
53 | event->setAccepted(mouseDoubleClick->isAccepted()); | ||
54 | if (!mouseDoubleClick->isAccepted()) { | ||
55 | @@ -678,7 +678,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve | ||
56 | } else if (touchMouseDevice == device && p.id() == touchMouseId) { | ||
57 | if (p.state() & Qt::TouchPointMoved) { | ||
58 | if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { | ||
59 | - QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, mouseGrabberItem, false)); | ||
60 | + QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), mouseGrabberItem, false)); | ||
61 | QCoreApplication::sendEvent(item, me.data()); | ||
62 | event->setAccepted(me->isAccepted()); | ||
63 | if (me->isAccepted()) { | ||
64 | @@ -689,7 +689,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve | ||
65 | // no grabber, check if we care about mouse hover | ||
66 | // FIXME: this should only happen once, not recursively... I'll ignore it just ignore hover now. | ||
67 | // hover for touch??? | ||
68 | - QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, item, false)); | ||
69 | + QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), item, false)); | ||
70 | if (lastMousePosition.isNull()) | ||
71 | lastMousePosition = me->windowPos(); | ||
72 | QPointF last = lastMousePosition; | ||
73 | @@ -707,7 +707,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve | ||
74 | } else if (p.state() & Qt::TouchPointReleased) { | ||
75 | // currently handled point was released | ||
76 | if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) { | ||
77 | - QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event, mouseGrabberItem, false)); | ||
78 | + QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event.data(), mouseGrabberItem, false)); | ||
79 | QCoreApplication::sendEvent(item, me.data()); | ||
80 | |||
81 | if (item->acceptHoverEvents() && p.screenPos() != QGuiApplicationPrivate::lastCursorPosition) { | ||
82 | -- | ||
83 | 2.9.3 | ||
84 | |||