Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qdbusconnection.pro | ||
| tst_qdbusconnection.cpp | ||
Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qdbusconnection.pro | ||
| tst_qdbusconnection.cpp | ||