forked from qt-creator/qt-creator
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e