Merge branch '2.5'

This commit is contained in:
Tim Kuipers 2017-03-28 12:55:18 +02:00
commit 7a67ab4e66
7 changed files with 63 additions and 56 deletions

View file

@ -259,6 +259,7 @@ UM.PreferencesPage
text: catalog.i18nc("@action:button","Center camera when item is selected");
checked: boolCheck(UM.Preferences.getValue("view/center_on_select"))
onClicked: UM.Preferences.setValue("view/center_on_select", checked)
enabled: Qt.platform.os != "windows" // Hack: disable the feature on windows as it's broken for pyqt 5.7.1.
}
}