Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495 |
||
|---|---|---|
| .. | ||
| signalbug | ||
| test | ||
| .gitignore | ||
| BLACKLIST | ||
| qobject.pro | ||
| tst_qobject.cpp | ||