Conflicts: src/plugins/qmldesigner/CMakeLists.txt Change-Id: I250c8e5284ddb0f335c440999b8920762419c89b