Conflicts: mkspecs/win32-clang-msvc/qmake.conf src/corelib/tools/qlist.h src/gui/painting/qcompositionfunctions.cpp src/gui/painting/qtriangulator_p.h src/gui/text/qfontengine_p.h src/network/kernel/qhostinfo_p.h src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io> Change-Id: Ib8a0308cf77224c4fbdcf56778fdac4a43e37798 |
||
|---|---|---|
| .. | ||
| desktopsettingsaware | ||
| modal | ||
| test | ||
| tmp | ||
| .gitignore | ||
| BLACKLIST | ||
| heart.svg | ||
| qapplication.pro | ||
| tst_qapplication.cpp | ||