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
..
qbackingstore	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qclipboard	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdrag	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qevent	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfileopenevent	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qguiapplication	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qguieventdispatcher	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
qguimetatype	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qguitimer	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
qguivariant	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qinputmethod	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qkeysequence	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmouseevent	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmouseevent_modal	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qpalette	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qscreen	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsurfaceformat	Added version() and setVersion() convenience API to QSurfaceFormat.	2013-02-08 20:00:00 +01:00
qtouchevent	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qwindow	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
kernel.pro	Added version() and setVersion() convenience API to QSurfaceFormat.	2013-02-08 20:00:00 +01:00