diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-06-22 11:36:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 04:46:00 +0200 |
| commit | 033bf75d99c281d4a133fada297b7b141a0af555 (patch) | |
| tree | d139897b8189a2c006dba1879b4f2241613d5649 | |
| parent | d2857ba596f334daca665aacfa074f71fc8ecdb4 (diff) | |
Clarify anchor error messages.
Task-number: QTBUG-24625
Change-Id: Icff9fe16f053f7e79039ef31bb56cae00cdf49d1
Reviewed-by: Bea Lam <bea.lam@nokia.com>
| -rw-r--r-- | src/quick/items/qquickanchors.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/quick/qquickanchors/tst_qquickanchors.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp index cc4239cc2e..0626c66fbb 100644 --- a/src/quick/items/qquickanchors.cpp +++ b/src/quick/items/qquickanchors.cpp @@ -1142,7 +1142,7 @@ bool QQuickAnchorsPrivate::checkHValid() const if (usedAnchors & QQuickAnchors::LeftAnchor && usedAnchors & QQuickAnchors::RightAnchor && usedAnchors & QQuickAnchors::HCenterAnchor) { - qmlInfo(item) << QQuickAnchors::tr("Cannot specify left, right, and hcenter anchors."); + qmlInfo(item) << QQuickAnchors::tr("Cannot specify left, right, and horizontalCenter anchors at the same time."); return false; } @@ -1173,13 +1173,13 @@ bool QQuickAnchorsPrivate::checkVValid() const if (usedAnchors & QQuickAnchors::TopAnchor && usedAnchors & QQuickAnchors::BottomAnchor && usedAnchors & QQuickAnchors::VCenterAnchor) { - qmlInfo(item) << QQuickAnchors::tr("Cannot specify top, bottom, and vcenter anchors."); + qmlInfo(item) << QQuickAnchors::tr("Cannot specify top, bottom, and verticalCenter anchors at the same time."); return false; } else if (usedAnchors & QQuickAnchors::BaselineAnchor && (usedAnchors & QQuickAnchors::TopAnchor || usedAnchors & QQuickAnchors::BottomAnchor || usedAnchors & QQuickAnchors::VCenterAnchor)) { - qmlInfo(item) << QQuickAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors."); + qmlInfo(item) << QQuickAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or verticalCenter anchors."); return false; } diff --git a/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp b/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp index 544fb4ba12..b91f8f15e8 100644 --- a/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp +++ b/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp @@ -308,7 +308,7 @@ void tst_qquickanchors::illegalSets_data() QTest::newRow("H - too many anchors") << "Rectangle { id: rect; Rectangle { anchors.left: rect.left; anchors.right: rect.right; anchors.horizontalCenter: rect.horizontalCenter } }" - << "file::2:23: QML Rectangle: Cannot specify left, right, and hcenter anchors."; + << "file::2:23: QML Rectangle: Cannot specify left, right, and horizontalCenter anchors at the same time."; foreach (const QString &side, QStringList() << "left" << "right") { QTest::newRow("H - anchor to V") @@ -327,11 +327,11 @@ void tst_qquickanchors::illegalSets_data() QTest::newRow("V - too many anchors") << "Rectangle { id: rect; Rectangle { anchors.top: rect.top; anchors.bottom: rect.bottom; anchors.verticalCenter: rect.verticalCenter } }" - << "file::2:23: QML Rectangle: Cannot specify top, bottom, and vcenter anchors."; + << "file::2:23: QML Rectangle: Cannot specify top, bottom, and verticalCenter anchors at the same time."; QTest::newRow("V - too many anchors with baseline") << "Rectangle { Text { id: text1; text: \"Hello\" } Text { anchors.baseline: text1.baseline; anchors.top: text1.top; } }" - << "file::2:47: QML Text: Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors."; + << "file::2:47: QML Text: Baseline anchor cannot be used in conjunction with top, bottom, or verticalCenter anchors."; foreach (const QString &side, QStringList() << "top" << "bottom" << "baseline") { |