From f19b1bf1bfee79178bf5cd75df86863be49c21f0 Mon Sep 17 00:00:00 2001 From: Jussi Witick Date: Fri, 17 Feb 2017 10:27:12 +0200 Subject: Increase QtQuick import from 2.2 to 2.6 for QML Label Increase QtQuick import version to 2.6 to enable the properties of underlying QML Text type to be usable in the QML Label type too. Task-number: QTBUG-57895 Change-Id: I7a2b641a56c90ab91b4e6c973278d8943fa6903a Reviewed-by: J-P Nurmi --- src/controls/Label.qml | 2 +- tests/auto/controls/data/tst_label.qml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/controls/Label.qml b/src/controls/Label.qml index f9bc8cdd..ea3f27b3 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -37,7 +37,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.6 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index e5c53a52..145c7f14 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -69,6 +69,17 @@ TestCase { label.destroy() } + function test_textPaddings() { + var label = Qt.createQmlObject('import QtQuick.Controls 1.2; Label { leftPadding: 2; rightPadding: 2; topPadding: 2; bottomPadding: 2 }', testCase, ''); + + compare(label.leftPadding, 2) + compare(label.rightPadding, 2) + compare(label.topPadding, 2) + compare(label.bottomPadding, 2) + + label.destroy() + } + function test_activeFocusOnTab() { if (Qt.styleHints.tabFocusBehavior != Qt.TabFocusAllControls) skip("This function doesn't support NOT iterating all.") -- cgit v1.2.1