diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-04 14:11:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-04 14:11:21 +0100 |
| commit | 735b9de01d301c738acc7a0b26d5703d998941fb (patch) | |
| tree | 00ab2e8b84a1187fc4b620d4b3924b9e50641ce8 /src/imports/controls/universal/ToolButton.qml | |
| parent | 340879d8263f9383d33ed4eb3271b00e54c13f47 (diff) | |
| parent | bce843844b8edabc4365d0ef7175b54551217631 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickpopup.cpp
Change-Id: Ic5cdde7a2d9daa0e616de999969a4399db23245b
Diffstat (limited to 'src/imports/controls/universal/ToolButton.qml')
| -rw-r--r-- | src/imports/controls/universal/ToolButton.qml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index f5fd5c88..57d5d045 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -59,7 +59,6 @@ T.ToolButton { elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - renderType: Text.NativeRendering } //! [contentItem] |