Conflicts: src/gui/accessible/qaccessible.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_mac.mm src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qapplication_win.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qdnd_x11.cpp src/gui/kernel/qwidget.cpp src/gui/widgets/qlabel.cpp Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba |
||
|---|---|---|
| .. | ||
| 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 | ||