Conflicts: src/gui/kernel/qplatformintegration.cpp src/gui/kernel/qplatformintegration.h src/plugins/platforms/wasm/qwasmintegration.cpp src/plugins/platforms/xcb/qxcbconnection_screens.cpp Change-Id: I15063d42e9a1e226d9d2d2d372f75141b84c5c1b |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| BLACKLIST | ||
| qtimer.pro | ||
| tst_qtimer.cpp | ||