-
Thomas Hartmann authored
Conflicts: src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
1f940786
Conflicts: src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp