Merge "Add smart space to custom clock faces." into qt-dev