forked from qt-creator/qt-creator
e5e3f91ed2
Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d