diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-04-04 12:06:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-08 08:44:11 +0000 |
| commit | 82e580bb91ebdde590d4f9beec242352918ce617 (patch) | |
| tree | f1dd3333871e0e0ef5cf6e7e4ce44a02e4e655e3 /tests/auto/qquickiconlabel | |
| parent | f3892b35a1560412f7368d540182eb83bfacc9cd (diff) | |
QQuickIconLabel: rename text property to label
In preparation for the next patch which adds a "QString text"
property to the API.
Change-Id: Ie904108353c37a02cbc992c067f3e09aed9c2497
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests/auto/qquickiconlabel')
| -rw-r--r-- | tests/auto/qquickiconlabel/data/iconlabel.qml | 2 | ||||
| -rw-r--r-- | tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml | 2 | ||||
| -rw-r--r-- | tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml index 9ce37b5c..e4edb970 100644 --- a/tests/auto/qquickiconlabel/data/iconlabel.qml +++ b/tests/auto/qquickiconlabel/data/iconlabel.qml @@ -60,7 +60,7 @@ Item { icon: Image { source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" } - text: Text { + label: Text { text: "Some text" } } diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml index 14c59001..e4d8259d 100644 --- a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml +++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml @@ -59,7 +59,7 @@ Item { IconLabel { spacing: 10 - text: Text { + label: Text { text: "Some text" } } diff --git a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp index d3d975ed..3012af20 100644 --- a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp +++ b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp @@ -126,7 +126,7 @@ void tst_qquickiconlabel::display() QQuickItem *icon = label->icon(); QVERIFY(icon); - QQuickItem *text = label->text(); + QQuickItem *text = label->label(); QVERIFY(text); label->setMirrored(mirrored); @@ -213,11 +213,11 @@ void tst_qquickiconlabel::spacingWithOneDelegate() QVERIFY(label); QQuickItem *delegate = nullptr; if (label->icon()) { - QVERIFY(!label->text()); + QVERIFY(!label->label()); delegate = label->icon(); } else { QVERIFY(!label->icon()); - delegate = label->text(); + delegate = label->label(); } QVERIFY(delegate); @@ -244,7 +244,7 @@ void tst_qquickiconlabel::emptyIconSource() QQuickItem *icon = label->icon(); QVERIFY(icon); - QQuickItem *text = label->text(); + QQuickItem *text = label->label(); QVERIFY(text); qreal horizontalCenter = label->width() / 2; const qreal combinedWidth = icon->width() + text->width(); |