qt5base-lts/examples/widgets
Frederik Gladhorn ca2f44680c Merge branch 'stable' into dev
Conflicts:
	examples/widgets/painting/shared/shared.pri
	src/corelib/tools/qharfbuzz_p.h
	src/corelib/tools/qunicodetools.cpp
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp

Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
2013-01-04 11:12:05 +01:00
..
animation add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
desktop clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
dialogs clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
doc Merge branch 'stable' into dev 2013-01-04 11:12:05 +01:00
draganddrop clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
effects clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
graphicsview add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
itemviews add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
layouts clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
mainwindows add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
painting Merge branch 'stable' into dev 2013-01-04 11:12:05 +01:00
richtext add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
scroller clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
statemachine add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
tools Merge branch 'stable' into dev 2013-01-04 11:12:05 +01:00
tutorials add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
widgets add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
widgets.pro Fix compile with -DQT_NO_DRAGANDDROP 2012-12-05 13:27:27 +01:00