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
concurrent.pro	Fixup concurrent docs	2012-11-30 00:48:37 +01:00
qtconcurrent_global.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentcompilertest.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentexception.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentfilter.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtconcurrentfilter.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentfilterkernel.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentfunctionwrappers.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentiteratekernel.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtconcurrentiteratekernel.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentmap.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtconcurrentmap.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentmapkernel.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentmedian.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentreducekernel.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentrun.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtconcurrentrun.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentrunbase.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentstoredfunctioncall.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtconcurrentthreadengine.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtconcurrentthreadengine.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00