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
..
access	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
bearer	Check existence of QProcess feature before using it on Qt autotests.	2013-01-28 16:06:15 +01:00
kernel	tests: Fix some more old references and links to Nokia	2013-02-01 15:27:37 +01:00
socket	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
ssl	Fix developer-build of qsslsocket_onDemandCertificates_member.	2013-02-12 17:56:10 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00