Frederik Gladhorn e65cd6f379 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629		2013-02-14 14:24:57 +01:00
..
translations	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
i18n.pro	fix install locations of examples/widgets/tools	2013-01-31 15:51:30 +01:00
i18n.qrc	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
languagechooser.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
languagechooser.h	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
main.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
mainwindow.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mainwindow.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00