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
..
animation	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
codecs	Correctly detect HTML 5 charset attribute in QTextCodec::codecForHtml()	2013-02-12 01:31:26 +01:00
global	Add qunsetenv(), next to qputenv() and friends.	2013-02-07 01:22:40 +01:00
io	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
json	Add toJson() formatting argument to QJsonDocument interface	2013-01-26 03:09:27 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
mimetypes	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
plugin	Check existence of QProcess feature before using it on Qt autotests.	2013-01-28 16:06:15 +01:00
statemachine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
thread	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
xml	tests: Fix some more old references and links to Nokia	2013-02-01 15:27:37 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00