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
..
image	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
itemmodels	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
math3d	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
painting	Fix warning about redefinition of M_PI in tst_qwmatrix.	2013-01-28 09:41:39 +01:00
qopengl	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
text	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
util	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
gui.pro	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00