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 0e80d28aa5 Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
	src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
	src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
	src/qml/qml/qqmlimport.cpp
	src/quick/items/context2d/qquickcontext2dtexture_p.h
	tools/qmleasing/splineeditor.h

Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5
 		2016-12-14 19:01:23 +01: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 Get rid of most QT_NO_FOO usages 2016-11-29 10:10:27 +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.8' into dev 2016-10-18 08:33:26 +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