qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tools/qml
History
Liang Qi bb7a5d0cb6 Merge remote-tracking branch 'origin/5.11' into dev 
Conflicts:
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4internalclass.cpp
	src/qml/parser/qqmljslexer.cpp
	src/qml/qml/v8/qv8engine.cpp
	src/qml/util/qqmladaptormodel_p.h
	src/quick/items/qquickanimatedsprite.cpp
	tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp

Change-Id: I16702b7a0da29c2a332afee47728d6a6ebf4fb3f
 		2018-02-27 08:43:10 +01:00
..
conf Fix outdated BSD license header 2017-10-17 11:18:11 +00:00
Info.plist Enable high-dpi mode for qml.app on OS X. 2015-06-16 11:53:13 +00:00
conf.h Updated license headers 2016-01-20 11:46:25 +00:00
main.cpp Merge remote-tracking branch 'origin/5.11' into dev 2018-02-27 08:43:10 +01:00
qml.icns Add qml tool 2013-09-17 03:04:56 +02:00
qml.pro Add a feature for qml-animation 2018-02-15 08:04:48 +00:00
qml.qrc Add qml tool 2013-09-17 03:04:56 +02:00