0e6ee136c9
Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c |
||
---|---|---|
.. | ||
access | ||
bearer | ||
kernel | ||
socket | ||
ssl | ||
network.pro |
0e6ee136c9
Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c |
||
---|---|---|
.. | ||
access | ||
bearer | ||
kernel | ||
socket | ||
ssl | ||
network.pro |