aadfe7d634
Conflicts: src/gui/kernel/qguiapplication.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h src/plugins/platforms/cocoa/qcocoawindow.h src/testlib/qtestsystem.h Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5 |
||
---|---|---|
.. | ||
dialogs | ||
doc | ||
kernel | ||
widgets | ||
configure.json | ||
printsupport.pro |