1fce111809
Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3 |
||
|---|---|---|
| .. | ||
| qdbusabstractadaptor | ||
| qdbusabstractinterface | ||
| qdbusconnection | ||
| qdbusconnection_no_bus | ||
| qdbuscontext | ||
| qdbusinterface | ||
| qdbuslocalcalls | ||
| qdbusmarshall | ||
| qdbusmetaobject | ||
| qdbusmetatype | ||
| qdbuspendingcall | ||
| qdbuspendingreply | ||
| qdbusreply | ||
| qdbusservicewatcher | ||
| qdbusthreading | ||
| qdbustype | ||
| qdbusxmlparser | ||
| dbus.pro | ||