Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74 |
||
|---|---|---|
| .. | ||
| testData/render | ||
| .gitignore | ||
| Ash_European.jpg | ||
| graphicsScene_selection.data | ||
| images.qrc | ||
| qgraphicsscene.pro | ||
| tst_qgraphicsscene.cpp | ||