-
Eike Ziller authored
Conflicts: src/plugins/autotest/qtest/qttestoutputreader.cpp Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f
90cf4487
Conflicts: src/plugins/autotest/qtest/qttestoutputreader.cpp Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f