Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe |
||
|---|---|---|
| .. | ||
| 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 | ||