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
..
qicoimageformat	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qicon	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qimage	Clean up logical dpi for QImage.	2013-01-31 10:39:38 +01:00
qimageiohandler	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qimagereader	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
qimagewriter	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
qmovie	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qpicture	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qpixmap	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
qpixmapcache	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
image.pro	QIcon: move back to QtGui	2012-05-18 21:42:38 +02:00