qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/benchmarks/qml
History
Liang Qi 2570b801c7 Merge remote-tracking branch 'origin/5.9' into 5.10 
Conflicts:
	.qmake.conf
	src/qml/compiler/qv4codegen.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/debugger/qqmlprofiler_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/memory/qv4mm.cpp
	src/qml/qml/qqmlcomponent.cpp
	src/qml/qml/qqmlobjectcreator.cpp
	src/qml/qml/qqmlobjectcreator_p.h
	src/qml/types/qqmldelegatemodel.cpp
	src/quick/items/qquickitem_p.h
	src/quick/items/qquickwindow.cpp
	tests/auto/quick/touchmouse/BLACKLIST
	tests/benchmarks/qml/holistic/tst_holistic.cpp

Change-Id: I520f349ab4b048dd337d9647113564fc257865c2
 		2018-01-24 09:34:11 +01:00
..
animation Fix animation benchmark 2018-01-02 09:52:02 +00:00
binding Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08 13:03:25 +02:00
compilation tst_compilation: Add a test for compilation of a large number of types 2017-01-24 17:37:40 +00:00
creation Fix QQml_setParent_noEvent not to print undefined behavior errors 2017-12-18 12:02:39 +00:00
holistic Merge remote-tracking branch 'origin/5.9' into 5.10 2018-01-24 09:34:11 +01:00
javascript Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08 13:03:25 +02:00
js Another benchmark fix 2017-05-05 13:14:26 +00:00
librarymetrics_performance Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 00:41:58 +02:00
painting Update to new QRandomGenerator API 2017-11-03 09:12:14 +00:00
qqmlchangeset Fix licensing 2017-05-04 04:30:21 +00:00
qqmlcomponent Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08 13:03:25 +02:00
qqmlmetaproperty Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08 13:03:25 +02:00
qquickwindow Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08 13:03:25 +02:00
script Fix benchmark: remove benchmarks containing old v8 references 2017-05-08 07:49:28 +00:00
typeimports Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08 13:03:25 +02:00
qml.pro Fix benchmark: remove benchmarks containing old v8 references 2017-05-08 07:49:28 +00:00