a1ad9a74eb
Conflicts: src/corelib/io/io.pri src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/network/socket/qabstractsocket.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro tests/auto/dbus/qdbusconnection/qdbusconnection.pro tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7 |
||
---|---|---|
.. | ||
qbackingstore | ||
qclipboard | ||
qdrag | ||
qevent | ||
qfileopenevent | ||
qguiapplication | ||
qguieventdispatcher | ||
qguieventloop | ||
qguimetatype | ||
qguitimer | ||
qguivariant | ||
qinputmethod | ||
qkeysequence | ||
qmouseevent | ||
qmouseevent_modal | ||
qopenglwindow | ||
qpalette | ||
qpixelformat | ||
qrasterwindow | ||
qscreen | ||
qsurfaceformat | ||
qtouchevent | ||
qwindow | ||
kernel.pro |