Conflicts: qmake/generators/win32/mingw_make.cpp Change-Id: I2f790bc8572bd22fea01edf7ca74595b29f063eb |
||
|---|---|---|
| .. | ||
| dialogs | ||
| effects | ||
| graphicsview | ||
| itemviews | ||
| kernel | ||
| styles | ||
| util | ||
| widgets | ||
| widgets.pro | ||
Conflicts: qmake/generators/win32/mingw_make.cpp Change-Id: I2f790bc8572bd22fea01edf7ca74595b29f063eb |
||
|---|---|---|
| .. | ||
| dialogs | ||
| effects | ||
| graphicsview | ||
| itemviews | ||
| kernel | ||
| styles | ||
| util | ||
| widgets | ||
| widgets.pro | ||