Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages

This commit is contained in:
Jaime van Kessel 2018-12-12 11:50:26 +01:00
commit e30ca20c54
156 changed files with 3195 additions and 3884 deletions

View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick 2.10
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
@ -43,6 +43,7 @@ Rectangle
}
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
renderType: Text.NativeRendering
height: UM.Theme.getSize("toolbox_heading_label").height
width: parent.width - UM.Theme.getSize("default_margin").width
wrapMode: Text.WordWrap