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 |
||
|---|---|---|
| .. | ||
| configure.pro | ||
| configure_pch.h | ||
| configureapp.cpp | ||
| configureapp.h | ||
| environment.cpp | ||
| environment.h | ||
| main.cpp | ||
| tools.cpp | ||
| tools.h | ||