qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/examples/quick/quickwidgets/quickwidget
History
Liang Qi 102fa9b6db Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	examples/quick/quickwidgets/quickwidget/main.cpp
	src/qml/jsruntime/qv4jsonobject.cpp
	src/qml/jsruntime/qv4qobjectwrapper.cpp
	src/qml/jsruntime/qv4qobjectwrapper_p.h
	src/qml/qml/qqmlengine.cpp
	src/qml/qml/qqmlpropertycache.cpp
	src/qml/qml/qqmlpropertycache_p.h
	src/quick/items/qquickanimatedsprite.cpp
	src/quick/items/qquickitem.cpp
	src/quick/items/qquickitem.h
	src/quick/items/qquickitem_p.h
	src/quick/items/qquickview_p.h
	src/quick/scenegraph/qsgcontext.cpp
	src/quick/scenegraph/qsgdefaultrendercontext.cpp

Change-Id: I172c6fbff97208f21ed4c8b6db3d1747a889f22b
 		2016-10-10 16:01:48 +02:00
..
doc Purge sRGB chunks from PNG in documentation. 2016-03-24 19:40:25 +00:00
customgl.qml Add a tab widget to QQuickWidget example 2016-06-20 15:50:32 +00:00
fbitem.cpp Add a tab widget to QQuickWidget example 2016-06-20 15:50:32 +00:00
fbitem.h Add a tab widget to QQuickWidget example 2016-06-20 15:50:32 +00:00
main.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-10 16:01:48 +02:00
quickwidget.pro Add a tab widget to QQuickWidget example 2016-06-20 15:50:32 +00:00
quickwidget.qrc Add a tab widget to QQuickWidget example 2016-06-20 15:50:32 +00:00
rotatingsquare.qml Enhance quickwidget example with all grabbing cases 2016-09-22 08:04:05 +00:00
rotatingsquaretab.qml Add a tab widget to QQuickWidget example 2016-06-20 15:50:32 +00:00