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
..
doc	fix doc page urls	2013-02-04 14:28:24 +01:00
dom	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
sax	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
qtxmlglobal.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
xml.pro	remove explicit load(qt_build_config)s from the libraries	2012-10-19 13:02:17 +02:00