4054c0d6ed
Conflicts: .qmake.conf src/plugins/platforms/xcb/qxcbscreen.cpp src/widgets/accessible/qaccessiblewidget.cpp Change-Id: Ib3138e61ba7981610940509a7ff02ba2dd281bf0 |
||
---|---|---|
.. | ||
qmake.conf | ||
qplatformdefs.h |
4054c0d6ed
Conflicts: .qmake.conf src/plugins/platforms/xcb/qxcbscreen.cpp src/widgets/accessible/qaccessiblewidget.cpp Change-Id: Ib3138e61ba7981610940509a7ff02ba2dd281bf0 |
||
---|---|---|
.. | ||
qmake.conf | ||
qplatformdefs.h |