a6b6e760ac
Conflicts: configure.exe src/corelib/global/qglobal.h src/gui/kernel/qplatformnativeinterface_qpa.h src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qmenu_mac.mm src/gui/widgets/qmenu_p.h src/gui/widgets/qmenubar.cpp src/gui/widgets/qmenubar_p.h src/gui/widgets/widgets.pri src/plugins/platforms/wayland/qwaylandnativeinterface.cpp src/plugins/platforms/wayland/qwaylandnativeinterface.h src/src.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp tests/auto/qstring/tst_qstring.cpp Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b |
||
---|---|---|
.. | ||
createpackage | ||
createpackage.bat | ||
createpackage.pl | ||
elf2e32_qtwrapper | ||
elf2e32_qtwrapper.bat | ||
elf2e32_qtwrapper.pl | ||
findtr | ||
fixqt4headers | ||
patch_capabilities | ||
patch_capabilities.bat | ||
patch_capabilities.pl | ||
qtmodule-configtests | ||
setcepaths.bat | ||
syncqt | ||
syncqt.bat |