qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/examples/qml
History
Liang Qi ae745746a6 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	src/qml/jsapi/qjsengine.cpp
	src/qml/qml/qqmlengine_p.h
	src/quick/items/qquickanchors.cpp
	src/quick/items/qquickanimatedimage_p_p.h
	src/quick/items/qquickitem_p.h
	tests/auto/qml/qqmlecmascript/testtypes.h
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
	tests/benchmarks/qml/creation/tst_creation.cpp

Change-Id: I65861e32f16e8a04c7090a90231627e1ebf6ba6f
 		2016-05-13 08:28:27 +02:00
..
doc/src Doc: Fixed several link errors 2015-09-07 08:44:57 +00:00
dynamicscene Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
locale Fixed license headers 2015-02-17 13:33:18 +00:00
networkaccessmanagerfactory Merge remote-tracking branch 'origin/5.4' into 5.5 2015-07-20 12:08:27 +02:00
qml-i18n Fix qml-i18n example 2015-05-05 07:38:58 +00:00
qmlextensionplugins Instantiate static Qml plugins declaring QQmlExtensionInterface only 2016-04-11 14:10:54 +00:00
referenceexamples Port examples to new connection syntax. 2015-07-22 22:16:19 +00:00
shell Fixed license headers 2015-02-17 13:33:18 +00:00
tutorials/extending-qml QML extensions tutorial: Add import plugin to app. bundle on OS X 2016-04-16 02:25:23 +00:00
xmlhttprequest Fixed license headers 2015-02-17 13:33:18 +00:00
qml.pro QtLite: no_network option for QtDeclarative 2016-03-04 13:09:51 +00:00