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
..
moc	Replace SRCDIR-define by QFINDTESTDATA in tst_moc.	2013-01-31 22:14:27 +01:00
qdbuscpp2xml	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qdbusxml2cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qmake	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
rcc	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
uic	Fix module name format in displayed code	2013-02-11 01:43:21 +01:00
tools.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00