qtdeclarative/examples/declarative/ui-components
Aaron Kennedy 9bcea0318c Merge branch 'master' into qtquick2
Conflicts:
	src/declarative/qml/qdeclarativeengine.cpp
2011-06-09 14:45:59 +10:00
..
dialcontrol Doc: Added missing license headers for documentation and examples. 2011-06-08 18:20:14 +02:00
flipable Merge branch 'master' into qtquick2 2011-06-09 14:45:59 +10:00
main Doc: Added missing license headers for documentation and examples. 2011-06-08 18:20:14 +02:00
progressbar Doc: Added missing license headers for documentation and examples. 2011-06-08 18:20:14 +02:00
scrollbar Doc: Added missing project and desktop files. 2011-05-23 14:27:59 +02:00
searchbox Doc: Added missing project and desktop files. 2011-05-23 14:27:59 +02:00
slideswitch Doc: Added missing license headers for documentation and examples. 2011-06-08 18:20:14 +02:00
spinner Doc: Added missing project and desktop files. 2011-05-23 14:27:59 +02:00
tabwidget Doc: Added missing project and desktop files. 2011-05-23 14:27:59 +02:00