user avatar
Attempted merge of origin/master
Samuel Rødal authored
Prepare for borkenness

Reviewed-by: Jens
Reviewed-by: Tor Arne

Conflicts:
	components/Button.qml
	components/ButtonRow.qml
	components/CheckBox.qml
	components/ChoiceList.qml
	components/ContextMenu.qml
	components/Dial.qml
	components/Frame.qml
	components/GroupBox.qml
	components/ProgressBar.qml
	components/RadioButton.qml
	components/ScrollArea.qml
	components/ScrollBar.qml
	components/Slider.qml
	components/SpinBox.qml
	components/Switch.qml
	components/Tab.qml
	components/TabBar.qml
	components/TabFrame.qml
	components/TableColumn.qml
	components/TableView.qml
	components/TextArea.qml
	components/TextField.qml
	components/ToolBar.qml
	components/ToolButton.qml
	components/custom/BasicButton.qml
	components/custom/Button.qml
	components/custom/CheckBox.qml
	components/custom/ChoiceList.qml
	components/custom/GroupBox.qml
	components/custom/ProgressBar.qml
	components/custom/Slider.qml
	components/custom/SpinBox.qml
	components/custom/TextField.qml
	components/custom/...
7855aaff