Conflicts: src/gui/kernel/qplatformtheme.h tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5 |
||
|---|---|---|
| .. | ||
| image | ||
| itemmodels | ||
| kernel | ||
| math3d | ||
| painting | ||
| qopengl | ||
| text | ||
| util | ||
| gui.pro | ||