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
..
bic/data	test: Add bic data for linux-gcc-amd64	2013-01-29 23:34:24 +01:00
cmake	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
compilerwarnings/data	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
concurrent	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
corelib	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
dbus	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
gui	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
network	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
opengl	Doc: Fix module name format	2013-01-25 17:27:44 +01:00
other	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
printsupport	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
shared	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
sql	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
testlib	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
xml	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
auto.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
network-settings.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtest-config.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
test.pl	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00