# Conflicts: # src/core/profiledataaccess.cpp # src/core/resourcedataaccess.cpp # src/qml/common/DetailedRadioButton.qml