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
..
codecs	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
completer	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
customcompleter	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
echoplugin	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
i18n	Merge branch 'stable' into dev	2013-01-04 11:12:05 +01:00
plugandpaint	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
plugandpaintplugins	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
regexp	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
settingseditor	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
styleplugin	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
treemodelcompleter	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
undo	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
undoframework	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
tools.pro	Fix compile with -DQT_NO_TRANSLATION	2012-12-05 17:29:46 +01:00