Conflicts: tests/auto/testlib/selftests/generate_expected_output.py Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7 |
||
|---|---|---|
| .. | ||
| qsignalspy | ||
| selftests | ||
| testlib.pro | ||
Conflicts: tests/auto/testlib/selftests/generate_expected_output.py Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7 |
||
|---|---|---|
| .. | ||
| qsignalspy | ||
| selftests | ||
| testlib.pro | ||