-
Eike Ziller authored
Conflicts: src/libs/qmldebug/qmldebugclient.cpp src/libs/qmldebug/qmldebugclient.h src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp Change-Id: I9594b4e9befc78f8138deb121f0bfc4212f7edbf
fa227a4e
Conflicts: src/libs/qmldebug/qmldebugclient.cpp src/libs/qmldebug/qmldebugclient.h src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp Change-Id: I9594b4e9befc78f8138deb121f0bfc4212f7edbf