Conflicts: src/plugins/platforms/windows/qwindowswindow.cpp tests/auto/widgets/kernel/qaction/tst_qaction.cpp Change-Id: Ia017a825ed2ca2d53ac586f4ae48df6f65818d40 |
||
|---|---|---|
| .. | ||
| itemviews | ||
| kernel | ||
| qgraphicsview | ||
| styles | ||
| widgets | ||
| widgets.pro | ||
Conflicts: src/plugins/platforms/windows/qwindowswindow.cpp tests/auto/widgets/kernel/qaction/tst_qaction.cpp Change-Id: Ia017a825ed2ca2d53ac586f4ae48df6f65818d40 |
||
|---|---|---|
| .. | ||
| itemviews | ||
| kernel | ||
| qgraphicsview | ||
| styles | ||
| widgets | ||
| widgets.pro | ||