From: Samuel Rødal Date: Mon, 24 Sep 2012 14:25:44 +0000 (+0200) Subject: Fixed instances of "to to" in qtdeclarative. X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=cca0a173bc12265fbfec1e4c73f2aee667cd5aa5;p=konrad%2Fqtdeclarative.git Fixed instances of "to to" in qtdeclarative. Really it should just be "to". Change-Id: I3263c8d6ce2f0ad33ab12d7ddb9202beac578f91 Reviewed-by: Sean Harmer --- diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index f1be15f..dc7cc13 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -139,7 +139,7 @@ typedef QPair QQuickXmlListRange; /*! \qmlproperty bool QtQuick.XmlListModel2::XmlRole::isKey Defines whether this is a key role. - Key roles are used to to determine whether a set of values should + Key roles are used to determine whether a set of values should be updated or added to the XML list model when XmlListModel::reload() is called. diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index a58c6bb..72c3f71 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -5038,7 +5038,7 @@ void tst_QQuickGridView::moveTransitions_data() QTest::newRow("move from below view, move 1 up, move to bottom, contentY not 0") << 30 << 1.0 << 0.0 << 25 << 17+3 << 1 << ListRange(17+3, 17+3); - QTest::newRow("move from below view, move multiple up, move to to bottom") + QTest::newRow("move from below view, move multiple up, move to bottom") << 30 << 0.0 << 0.0 << 20 << 17 << 3 << ListRange(17, 17); QTest::newRow("move from below view, move multiple up, move to bottom, contentY not 0") diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index c1aa946..6f4c251 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -6014,7 +6014,7 @@ void tst_QQuickListView::moveTransitions_data() << 20 << 15 << 1 << ListRange(15, 15); QTest::newRow("move from below view, move 1 up, move to bottom, contentY not 0") << 30 << 4*20.0 << 0.0 << 25 << 15+4 << 1 << ListRange(15+4, 15+4); - QTest::newRow("move from below view, move multiple up, move to to bottom") << 30 << 0.0 << 0.0 + QTest::newRow("move from below view, move multiple up, move to bottom") << 30 << 0.0 << 0.0 << 20 << 15 << 3 << ListRange(15, 15); QTest::newRow("move from below view, move multiple up, move to bottom, contentY not 0") << 30 << 4*20.0 << 0.0 << 25 << 15+4 << 3 << ListRange(15+4, 15+4);