qt/qtdeclarative.git, branch wip/scenegraphng Qt Declarative (Quick 2) Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng" 2019-05-28T15:59:40+00:00 Laszlo Agocs laszlo.agocs@qt.io 2019-05-28T15:59:34+00:00 1f3c157ec6b8be5de1eb89295713c2980fb1a7aa 






Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
2019-05-28T15:59:40+00:00

Laszlo Agocs
laszlo.agocs@qt.io

2019-05-28T15:59:34+00:00

0f5c34f2c6b64bae3429706a6c4211334c689092

Change-Id: Ie7dbc5a7d9eccd1613283134a1b47ab597d036d5





Change-Id: Ie7dbc5a7d9eccd1613283134a1b47ab597d036d5







Don't set childMode on a StateMachine
2019-05-27T07:49:45+00:00

Ulf Hermann
ulf.hermann@qt.io

2019-05-27T07:40:17+00:00

9d61684d70c8691d81536b7b519388586e2cbbb8

This leads to invalid state machines and is rejected since
cfdbfcebbda5f26b89c70df6b191b17ef242e9d7 in qtbase. Rather, add a
separate state in between to set the ParallelStates mode.

Change-Id: Ia08b286da4c60a26d3043179250f81fb4328864f
Fixes: QTBUG-75976
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 




This leads to invalid state machines and is rejected since
cfdbfcebbda5f26b89c70df6b191b17ef242e9d7 in qtbase. Rather, add a
separate state in between to set the ParallelStates mode.

Change-Id: Ia08b286da4c60a26d3043179250f81fb4328864f
Fixes: QTBUG-75976
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 






Merge "Merge remote-tracking branch 'origin/5.13' into dev"
2019-05-26T21:05:16+00:00

Qt Forward Merge Bot
qt_forward_merge_bot@qt-project.org

2019-05-26T21:05:16+00:00

59f04faaedc001829f7abbd1bca3c03335f0f98c












Merge remote-tracking branch 'origin/5.13' into dev
2019-05-26T21:05:16+00:00

Qt Forward Merge Bot
qt_forward_merge_bot@qt-project.org

2019-05-26T21:05:16+00:00

f8aae9006fa55d257a34d8fa1cb89974b10b3045

Change-Id: I73d323b65c628166ac2d422f7e8af2062200d53c





Change-Id: I73d323b65c628166ac2d422f7e8af2062200d53c







Remove null pointer checks for "this" from QQmlContextData::resolvedUrl()
2019-05-23T09:22:34+00:00

Pavel Tumakaev
p.tumakaev@lgepartner.com

2019-05-22T14:32:25+00:00

19ca4af1a248486844ea9bf96eba62ce564ecdc9

According to ISO/IEC 14882 §5.2.5/3 "If E1 has the type “pointer to class
X,” then the expression E1->E2 is converted to the equivalent form
(*(E1)).E2;". Thus, as QQmlContextData::resolvedUrl() is non-static method,
it cannot be called on a null pointer because it leads to undefined
behavior, and “this“ in QQmlContextData::resolvedUrl() cannot be a null
pointer. According to this document:
https://gcc.gnu.org/gcc-6/porting_to.html , starting from version 6, GCC
optimizations remove null pointer checks for "this", since "the this
pointer can never be null, which is guaranteed by the language rules."
Thus, on the one hand the “if (ctxt)“ check in
QQmlContextData::resolvedUrl() does nothing, on the other “if (engine“
check leads to undefined behavior if ctxt/this == nullptr.

Task-number: QTBUG-75983
Change-Id: Idfb1e26758d83223bb0845139d63e2e8e80dc714
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 




According to ISO/IEC 14882 §5.2.5/3 "If E1 has the type “pointer to class
X,” then the expression E1->E2 is converted to the equivalent form
(*(E1)).E2;". Thus, as QQmlContextData::resolvedUrl() is non-static method,
it cannot be called on a null pointer because it leads to undefined
behavior, and “this“ in QQmlContextData::resolvedUrl() cannot be a null
pointer. According to this document:
https://gcc.gnu.org/gcc-6/porting_to.html , starting from version 6, GCC
optimizations remove null pointer checks for "this", since "the this
pointer can never be null, which is guaranteed by the language rules."
Thus, on the one hand the “if (ctxt)“ check in
QQmlContextData::resolvedUrl() does nothing, on the other “if (engine“
check leads to undefined behavior if ctxt/this == nullptr.

Task-number: QTBUG-75983
Change-Id: Idfb1e26758d83223bb0845139d63e2e8e80dc714
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 






Manual test, TableView: improve test with syncView functionality
2019-05-23T07:46:07+00:00

Richard Moe Gustavsen
richard.gustavsen@qt.io

2019-03-22T10:41:15+00:00

4ce9717c6de3f69556b90d97c40fcfc5bb54b6d4

Add some more TableViews and buttons that can
be used to test the new syncView functionality.

Change-Id: I0ad649598ef2ff08487c9a0b450861c27535c62c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 




Add some more TableViews and buttons that can
be used to test the new syncView functionality.

Change-Id: I0ad649598ef2ff08487c9a0b450861c27535c62c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 






Tooling: Guard use of QRegularExpression
2019-05-23T09:30:27+00:00

Ulf Hermann
ulf.hermann@qt.io

2019-05-23T08:42:57+00:00

b6adafe256c87f611b8e6790dbf37c80aa98e353

The Qt we are using might be compiled without regular expressions. The
epxression in qqmldebugserver.cpp is actually not needed as
QString::toInt() can do this check for us. The ones in
globalinspector.cpp are only for reformatting the name in a nicer way
for the selection highlight. We can skip those in case there are no
regular expressions.

Change-Id: I71e3f0314d8a68a41c3da2568207e311c6b41d1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 




The Qt we are using might be compiled without regular expressions. The
epxression in qqmldebugserver.cpp is actually not needed as
QString::toInt() can do this check for us. The ones in
globalinspector.cpp are only for reformatting the name in a nicer way
for the selection highlight. We can skip those in case there are no
regular expressions.

Change-Id: I71e3f0314d8a68a41c3da2568207e311c6b41d1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 






Tooling: Use QRegularExpression rather than QRegExp
2019-05-22T16:19:38+00:00

Ulf Hermann
ulf.hermann@qt.io

2019-05-22T16:13:46+00:00

c10bab71dc37ecffe67c6d9060f0dc37c2fcc7ea

Task-number: QTBUG-72588
Change-Id: Ib79107ea01de2dee49dc783f1d88807d1852c3ba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
 




Task-number: QTBUG-72588
Change-Id: Ib79107ea01de2dee49dc783f1d88807d1852c3ba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
 






Blacklist tst_QQuickListView::currentIndex() on macOS 10.12
2019-05-22T08:57:55+00:00

Ulf Hermann
ulf.hermann@qt.io

2019-05-22T08:57:12+00:00

fb4c12a9db86a4b886058cc937c3c20b798bd2e2

Task-number: QTBUG-75960
Change-Id: I3321bf54a11c1daf8d4e1818c5b860359c34fdec
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
 




Task-number: QTBUG-75960
Change-Id: I3321bf54a11c1daf8d4e1818c5b860359c34fdec
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>