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
..
application.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
application_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
atspiadaptor.cpp	Accessibility: Ignore TableModelChanges on Linux for now.	2013-02-07 16:10:47 +01:00
atspiadaptor_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
bridge.cpp	Add translator help for accessibility strings	2013-02-08 12:06:36 +01:00
bridge_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
cache.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
cache_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
constant_mappings.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
constant_mappings_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
dbusconnection.cpp	Accessibility Linux: Make dbus registration async	2013-01-22 14:11:14 +01:00
dbusconnection_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
linuxaccessibility.pri	Disable only accessibility bridge without dbus on linux	2013-01-23 10:56:34 +01:00
struct_marshallers.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
struct_marshallers_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00