qt/qtdeclarative.git/src/quick/items, branch wip/cmake Qt Declarative (Quick 2) Merge remote-tracking branch 'origin/5.15' into dev 2020-03-09T08:58:49+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-03-09T00:00:06+00:00 d51d5ff3c187821929cf7b765e037423bcc90466 Conflicts: src/qml/compiler/qqmlirbuilder_p.h src/qml/qml/qqmlpropertycachecreator_p.h src/qmltyperegistrar/qmltypesclassdescription.cpp src/qmltyperegistrar/qmltypesclassdescription.h src/qmltyperegistrar/qmltypescreator.cpp src/quick/items/qquicktext_p.h src/quick/util/qquickvaluetypes_p.h Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5 
 Conflicts:
	src/qml/compiler/qqmlirbuilder_p.h
	src/qml/qml/qqmlpropertycachecreator_p.h
	src/qmltyperegistrar/qmltypesclassdescription.cpp
	src/qmltyperegistrar/qmltypesclassdescription.h
	src/qmltyperegistrar/qmltypescreator.cpp
	src/quick/items/qquicktext_p.h
	src/quick/util/qquickvaluetypes_p.h

Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5
Avoid using deprecated QTabletEvent::device() 2020-03-07T06:31:29+00:00 Simon Hausmann simon.hausmann@qt.io 2020-03-06T10:11:32+00:00 12ddd8da1b2dcfbbca10a6915547456601a726c0 That member was removed in qtbase dev. Change-Id: Ia2e69ee53e154fdb9b8b4c707ac5a463011cf0c1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
That member was removed in qtbase dev.

Change-Id: Ia2e69ee53e154fdb9b8b4c707ac5a463011cf0c1
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Doc: clarify the fontSizeMode property in terms of Rich and Styled text 2020-03-06T08:27:08+00:00 Andy Shaw andy.shaw@qt.io 2020-03-06T07:07:56+00:00 ec33541cf3873bc311522d3ae24c75cf6aa28a6b Fixes: QTBUG-56650 Change-Id: I7b750031f3af368de7f7cebe64a5d1ce77f68408 Reviewed-by: Paul Wicking <paul.wicking@qt.io> 
Fixes: QTBUG-56650
Change-Id: I7b750031f3af368de7f7cebe64a5d1ce77f68408
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Merge remote-tracking branch 'origin/5.14' into 5.15 2020-03-03T11:23:20+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-03-03T00:00:05+00:00 04e3918f0fd0c19ed830d406e1c549a037089cc4 Conflicts: src/qmlmodels/qqmltableinstancemodel.cpp src/qmlmodels/qqmltableinstancemodel_p.h Change-Id: I89339b1cb41ba27fe30c79530859a1c2bfbecc69 
 Conflicts:
	src/qmlmodels/qqmltableinstancemodel.cpp
	src/qmlmodels/qqmltableinstancemodel_p.h

Change-Id: I89339b1cb41ba27fe30c79530859a1c2bfbecc69
QQuickItem: prevent endless loop in focus tab chain 2020-03-02T17:48:24+00:00 Wang Chuan ouchuanm@outlook.com 2020-02-26T13:14:50+00:00 254a56252874b63430701351dcd8c9bef8507353 Since the commit a18ab2a3822e0d, we promote the [startItem] in focus tab chain when it is invisible to prevent endless loop. However the problem still happen if the [startItem] is equal to [firstFromItem] Fixes it by compare the [current] item with the original start item Fixes: QTBUG-81510 Change-Id: Iae0207f39e2b8c4fc6ed0cf36f0a855668accfba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
Since the commit a18ab2a3822e0d, we promote the [startItem] in focus
tab chain when it is invisible to prevent endless loop. However the
problem still happen if the [startItem] is equal to [firstFromItem]

Fixes it by compare the [current] item with the original start item

Fixes: QTBUG-81510
Change-Id: Iae0207f39e2b8c4fc6ed0cf36f0a855668accfba
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Fix building qtdeclarative without QMovie support 2020-03-02T16:50:22+00:00 Jean-Michaël Celerier jeanmichael.celerier@gmail.com 2020-03-01T14:14:34+00:00 b760d972459fd3b0c41e4c85076fa933ba5c0d1d Change-Id: Id8e8b04e722bd9fc84b6b78530f75cf8d6d96da7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
Change-Id: Id8e8b04e722bd9fc84b6b78530f75cf8d6d96da7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
doc: fix typo in signal name 2020-03-02T11:26:53+00:00 Rolf Eike Beer eb@emlix.com 2020-03-02T11:05:07+00:00 be2c7864983b23b6337305b4653987b1efa8718e Change-Id: I19b3a78ddbde481af8847a3d340e62d56240de29 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Change-Id: I19b3a78ddbde481af8847a3d340e62d56240de29
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Deprecate non-const version of saveToFile() 2020-02-28T16:08:36+00:00 Jan Arve Sæther jan-arve.saether@qt.io 2020-02-26T08:35:10+00:00 d8f6f41c334d14c4712b1dc16554f80bb1290e24 It will be removed in Qt 6 Change-Id: I7d8853ce3008bb2c594caa5a23e2964158717fe4 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
It will be removed in Qt 6

Change-Id: I7d8853ce3008bb2c594caa5a23e2964158717fe4
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Properly deprecate QQuickText::doLayout() and get rid of it for Qt6 2020-02-28T16:08:28+00:00 Jan Arve Sæther jan-arve.saether@qt.io 2020-02-25T15:42:15+00:00 8319597ae30219c71aef9d2086e8e8294802686c It was only deprecated through its documentation. Change-Id: I0b7bdeec4ed965c3df627a03ab0e539c4e9c2018 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
It was only deprecated through its documentation.

Change-Id: I0b7bdeec4ed965c3df627a03ab0e539c4e9c2018
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
QQuickTableView: Immediately delete delegates when possible 2020-02-28T11:05:39+00:00 Ulf Hermann ulf.hermann@qt.io 2020-02-19T13:00:46+00:00 46162c304195db2376706f2e1a9da2b2c938e97b In the dtor we don't need to care about any side effects a direct delete may have. Rather, any deleteLater() may not take effect anymore as the event loop may be gone already. Task-number: QTBUG-82000 Change-Id: I97935dc47fbbfd0c050e80c333c36a05f685c45d Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
In the dtor we don't need to care about any side effects a direct
delete may have. Rather, any deleteLater() may not take effect
anymore as the event loop may be gone already.

Task-number: QTBUG-82000
Change-Id: I97935dc47fbbfd0c050e80c333c36a05f685c45d
Reviewed-by: Joni Poikelin <joni.poikelin@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>