Conflicts: src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Iad9ef6bf7d6111efba8232a7d9b46bb9974912f5 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qwidget_window.pro | ||
| tst_qwidget_window.cpp | ||
Conflicts: src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Iad9ef6bf7d6111efba8232a7d9b46bb9974912f5 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qwidget_window.pro | ||
| tst_qwidget_window.cpp | ||