Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af |
||
|---|---|---|
| .. | ||
| qdbusabstractadaptor | ||
| qdbusabstractinterface | ||
| qdbusconnection | ||
| qdbusconnection_no_bus | ||
| qdbuscontext | ||
| qdbusinterface | ||
| qdbuslocalcalls | ||
| qdbusmarshall | ||
| qdbusmetaobject | ||
| qdbusmetatype | ||
| qdbuspendingcall | ||
| qdbuspendingreply | ||
| qdbusreply | ||
| qdbusservicewatcher | ||
| qdbusthreading | ||
| qdbustype | ||
| qdbusxmlparser | ||
| dbus.pro | ||