305dd1b61f
Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e |
||
---|---|---|
.. | ||
noqteventloop | ||
qbackingstore | ||
qclipboard | ||
qcursor | ||
qdrag | ||
qevent | ||
qfileopenevent | ||
qguiapplication | ||
qguieventdispatcher | ||
qguieventloop | ||
qguimetatype | ||
qguitimer | ||
qguivariant | ||
qinputmethod | ||
qkeyevent | ||
qkeysequence | ||
qmouseevent | ||
qmouseevent_modal | ||
qopenglwindow | ||
qpalette | ||
qpixelformat | ||
qrasterwindow | ||
qscreen | ||
qsurfaceformat | ||
qtouchevent | ||
qwindow | ||
kernel.pro |