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
..
translations	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
i18n.pro	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
i18n.qrc	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
languagechooser.cpp	add auto-detect system language in i18n example	2012-12-12 23:34:19 +01:00
languagechooser.h	add auto-detect system language in i18n example	2012-12-12 23:34:19 +01:00
main.cpp	add auto-detect system language in i18n example	2012-12-12 23:34:19 +01:00
mainwindow.cpp	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
mainwindow.h	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00