Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c |
||
|---|---|---|
| .. | ||
| qfactoryloader | ||
| qlibrary | ||
| qplugin | ||
| qpluginloader | ||
| quuid | ||
| plugin.pro | ||
Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c |
||
|---|---|---|
| .. | ||
| qfactoryloader | ||
| qlibrary | ||
| qplugin | ||
| qpluginloader | ||
| quuid | ||
| plugin.pro | ||