-
Eike Ziller authored
Conflicts: src/plugins/qmlprofiler/qmlprofilertraceview.cpp Change-Id: Ib1d75a8572f650898cb598d008867e2c0514d752
b5f49273
Conflicts: src/plugins/qmlprofiler/qmlprofilertraceview.cpp Change-Id: Ib1d75a8572f650898cb598d008867e2c0514d752