qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,736 Commits 81 Branches 266 Tags 297 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Liang Qi 68ba8fe3cc Merge remote-tracking branch 'origin/5.6' into 5.7 
This change also fixes the build of two benchmarks, tst_affectors
and tst_emission.

Conflicts:
	src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
	src/qml/qml/ftw/qhashfield_p.h
	tests/benchmarks/particles/affectors/tst_affectors.cpp
	tests/benchmarks/particles/emission/tst_emission.cpp
	tests/benchmarks/qml/pointers/pointers.pro
	tests/benchmarks/qml/pointers/tst_pointers.cpp
	tests/benchmarks/qml/qmltime/qmltime.pro
	tests/benchmarks/qml/qquickwindow/qquickwindow.pro

Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
 2016-04-08 13:03:25 +02:00
Robin Burchell c19590f720 Move qmltime out of benchmarks directory. 
This is a tool, not a benchmark.

Change-Id: Ie6b4452a1235923e1663a8a525ddad8408d21545
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-03-15 08:20:36 +00:00