Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commit |
||
|---|---|---|
| .. | ||
| qsignalspy | ||
| selftests | ||
| testlib.pro | ||
Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commit |
||
|---|---|---|
| .. | ||
| qsignalspy | ||
| selftests | ||
| testlib.pro | ||