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
..
qabstracttextdocumentlayout	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qcssparser	Fix minor typos in docs, printed messages & comments	2013-01-28 18:12:41 +01:00
qfont	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfontdatabase	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfontmetrics	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
qglyphrun	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qrawfont	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qstatictext	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsyntaxhighlighter	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextblock	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextcursor	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextdocument	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextdocumentfragment	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextdocumentlayout	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextformat	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextlayout	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextlist	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextobject	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextodfwriter	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextpiecetable	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtextscriptengine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtexttable	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qzip	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
text.pro	Start running some disabled tests again on Mac OS.	2012-04-23 09:46:22 +02:00