qt/qtdeclarative.git, branch 5.7 Qt Declarative (Quick 2) Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-25T22:35:34+00:00 Liang Qi liang.qi@qt.io 2016-11-25T22:35:34+00:00 cc1c3d0e2be6dfea6befebdc5f25e519e3fe79b2 Conflicts: src/qml/compiler/qv4ssa.cpp src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/quick/util/qquickprofiler_p.h Change-Id: I11a89c2a166115d6697adfba09928805643e709e 
Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	src/quick/util/qquickprofiler_p.h

Change-Id: I11a89c2a166115d6697adfba09928805643e709e
Doc: fix incorrect syntax in "Code-Behind Implementation Resource" 2016-11-25T10:35:12+00:00 Mitch Curtis mitch.curtis@qt.io 2016-11-25T10:17:12+00:00 4fae8ff1e73eeb48734b28a9c846fbdff1c2ffe1 Change-Id: Ie86302f12d4ad65ff46335a1ea248bbb4c5559f3 Task-number: QTBUG-56008 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> 
Change-Id: Ie86302f12d4ad65ff46335a1ea248bbb4c5559f3
Task-number: QTBUG-56008
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
QmlProfiler: Explicitly specify the offsets for scene graph events 2016-11-24T14:31:11+00:00 Ulf Hermann ulf.hermann@qt.io 2016-11-24T10:50:45+00:00 2837f1c868b92e7cc8293064ff7ec3f76cdf6c7b The profiler can be switched on in the middle of a frame. In that case the last offset into the timing data would be some random number, which may lead to a crash when recording the sample. However, as we know all the data points we are going to record, we can as well specify where they are supposed to go. The timings themselves may still be random for frames of which we only recorded parts, but the clients can deal with this. Task-number: QTBUG-57304 Change-Id: I1d507f2591516e43d5b3cd25f7939716f2b64ed9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
The profiler can be switched on in the middle of a frame. In that case
the last offset into the timing data would be some random number, which
may lead to a crash when recording the sample.
However, as we know all the data points we are going to record, we can
as well specify where they are supposed to go. The timings themselves
may still be random for frames of which we only recorded parts, but
the clients can deal with this.

Task-number: QTBUG-57304
Change-Id: I1d507f2591516e43d5b3cd25f7939716f2b64ed9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge remote-tracking branch 'origin/5.7.1' into 5.7 2016-11-24T10:48:27+00:00 Liang Qi liang.qi@qt.io 2016-11-24T10:48:26+00:00 7fa08472d32055a3d6e8b775b843f38ef65e9ce6 Change-Id: I913caed34667ba64cac8540364f15c89e74431ed 
Change-Id: I913caed34667ba64cac8540364f15c89e74431ed
V4: Fix JIT codegen for null/undefined conditional jumps 2016-11-23T13:00:59+00:00 Erik Verbruggen erik.verbruggen@digia.com 2016-11-23T12:56:34+00:00 c712f638a0a3ad2a71a9a18601fd320dabd50f16 When checking for undefined, both the tag and the value need to be checked. When loading the tag, it shouldn't end up in the same register that is used to hold the address of the QV4::Value. Change-Id: I380fce432ba489fdabe569dd2c9cac31e9905260 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
When checking for undefined, both the tag and the value need to be
checked. When loading the tag, it shouldn't end up in the same register
that is used to hold the address of the QV4::Value.

Change-Id: I380fce432ba489fdabe569dd2c9cac31e9905260
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Improved robustness of the optimizer when removing expressions 2016-11-22T15:40:58+00:00 Simon Hausmann simon.hausmann@qt.io 2016-11-22T14:16:09+00:00 c4ebe96c34c2179d0ebdc555afdce179e3de52e8 For example during dead code elimination we may invalidate statements, but at the same time there may still be instances left in the work list of optimizeSSA(). When we encounter then, we should not process them any further. Task-number: QTBUG-56255 Change-Id: I4c24b1a225ce1bde112172e9606f91c426c19f19 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> 
For example during dead code elimination we may invalidate statements,
but at the same time there may still be instances left in the work list
of optimizeSSA(). When we encounter then, we should not process them any
further.

Task-number: QTBUG-56255
Change-Id: I4c24b1a225ce1bde112172e9606f91c426c19f19
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Text: Make use of the new cached isSmoothlyScaled attribute on QFontEngine 2016-11-18T12:41:31+00:00 Robin Burchell robin.burchell@viroteck.net 2016-11-11T14:35:02+00:00 5ffd0d8be35cea57acbf1e8d7a740d3fab5cbe43 Relies on qtbase/f2205c48c21a6b135f2f59d0cf46e72f90f9f0f4. Asking QFontDatabase whether or not the font can be smoothly scaled is expensive Now that the attribute is available on QFontEngine, we can bypass all that. Benchmark results from qmlbench on creation/delegates_text on a 2011 mbp. Before: Average: 173.2 ops/frame; using 5/5 samples; MedianAll=173; StdDev=1.94, CoV=0.0112 - StdDev (all samples included)=1.94 After: Average: 180.8 ops/frame; using 5/5 samples; MedianAll=182; StdDev=1.94, CoV=0.0107 - StdDev (all samples included)=1.94 Change-Id: I56efd903037a29ee014de0cbf482cfbef7fce494 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> 
Relies on qtbase/f2205c48c21a6b135f2f59d0cf46e72f90f9f0f4.

Asking QFontDatabase whether or not the font can be smoothly scaled is expensive
Now that the attribute is available on QFontEngine, we can bypass all that.

Benchmark results from qmlbench on creation/delegates_text on a 2011 mbp.

Before: Average: 173.2 ops/frame; using 5/5 samples; MedianAll=173; StdDev=1.94, CoV=0.0112 - StdDev (all samples included)=1.94
After:  Average: 180.8 ops/frame; using 5/5 samples; MedianAll=182; StdDev=1.94, CoV=0.0107 - StdDev (all samples included)=1.94

Change-Id: I56efd903037a29ee014de0cbf482cfbef7fce494
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Fix binding re-evaluation when list model properties change 2016-11-18T11:06:31+00:00 Simon Hausmann simon.hausmann@qt.io 2016-09-01T14:46:29+00:00 1969991c4a4bd39ee224b0fa3c8cffa51f061757 This is a regression from commit 4876ea6a18ccdfd72014582aa5d50ab9f6b6ec9e, which avoided returning an expensive QObject when calling get() but also lost the ability to perform binding captures when accessing the properties. This change restores the captures by performing them by hand in get() and also triggering the notifiers directly when the values change, without creating the QObject. Task-number: QTBUG-52356 Change-Id: Ia429ffafd4032b63d3e592aa63bb0864a24e0965 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io> 
This is a regression from commit
4876ea6a18ccdfd72014582aa5d50ab9f6b6ec9e, which avoided returning an
expensive QObject when calling get() but also lost the ability to
perform binding captures when accessing the properties. This change
restores the captures by performing them by hand in get() and also
triggering the notifiers directly when the values change, without
creating the QObject.

Task-number: QTBUG-52356
Change-Id: Ia429ffafd4032b63d3e592aa63bb0864a24e0965
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Doc: fix incorrect argument name for createQmlObject() 2016-11-17T13:15:10+00:00 Mitch Curtis mitch.curtis@qt.io 2016-11-17T11:40:25+00:00 a3fe91ba463fcd27d6e0a69b66bc389bd6470c46 "string" is the argument type, not its name. Change-Id: Ia8f1afe01363eb6bfa69247aca5c0849c56000c4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> 
"string" is the argument type, not its name.

Change-Id: Ia8f1afe01363eb6bfa69247aca5c0849c56000c4
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
QML: Fix memory leak in a benchmark 2016-11-16T14:36:38+00:00 Erik Verbruggen erik.verbruggen@qt.io 2016-11-16T13:04:04+00:00 5718dac919c16e9c6c7b98043e1ecb74117af268 Change-Id: I64b671243a107c518da2000e2ffd964f441af037 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> 
Change-Id: I64b671243a107c518da2000e2ffd964f441af037
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>