Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| double_data.h | ||
| qstring.pro | ||
| tst_qstring.cpp | ||