qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/src/quick
History
Liang Qi b1fa22c168 Merge remote-tracking branch 'origin/5.8' into 5.9 
Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/quick/accessible/qaccessiblequickview_p.h
	src/quick/items/qquickmousearea.cpp
	src/quick/util/qquickanimatorjob.cpp
	tools/qmlplugindump/main.cpp

Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
 		2017-02-24 11:48:14 +01:00
..
accessible Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
designer Merge remote-tracking branch 'origin/5.8' into dev 2016-12-14 19:01:23 +01:00
doc Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
items Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
scenegraph Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
util Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
configure.json Search for configure tests in the correct directory 2016-10-14 15:33:09 +00:00
qtquick2.cpp Merge remote-tracking branch 'origin/5.8' into dev 2016-12-14 19:01:23 +01:00
qtquick2_p.h
…
qtquickglobal.h Convert qtdeclarative over to use the new configure system 2016-10-10 14:11:39 +00:00
qtquickglobal_p.h Convert qtdeclarative over to use the new configure system 2016-10-10 14:11:39 +00:00
quick.pro Quick: Remove last foreach, and mark QT_NO_FOREACH 2017-01-16 10:02:56 +00:00