-
Eike Ziller authored
Conflicts: src/plugins/qmljstools/qmlconsoleitemdelegate.cpp src/plugins/qmlprofiler/qmlprofilerengine.cpp Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4
4acece6d
Conflicts: src/plugins/qmljstools/qmlconsoleitemdelegate.cpp src/plugins/qmlprofiler/qmlprofilerengine.cpp Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4