Conflicts: examples/widgets/applicationicon/applicationicon.svg examples/widgets/applicationicon/main.cpp examples/widgets/elidedlabel/elidedlabel.cpp examples/widgets/elidedlabel/elidedlabel.h examples/widgets/elidedlabel/main.cpp examples/widgets/elidedlabel/testwidget.cpp examples/widgets/elidedlabel/testwidget.h (cherry picked from commit 1b555a91f05b68c697b6985d1b672dc0fba5fc5a) (cherry picked from commit c0e0bfdd451f42b10051e8064153b811080ffa0e) |
||
|---|---|---|
| .. | ||
| elidedlabel.cpp | ||
| elidedlabel.desktop | ||
| elidedlabel.h | ||
| elidedlabel.pro | ||
| main.cpp | ||
| testwidget.cpp | ||
| testwidget.h | ||