Conflicts: src/plugins/qmlprofiler/qmlprofilertool.cpp Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af