diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-12-12 08:50:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-12 10:37:57 +0100 |
| commit | 1cad275b6103ce834c9e1ec5d187e7e97e80a119 (patch) | |
| tree | cb51d14e0e0b99876edcef1d9160504fe8bbde24 | |
| parent | 11594920236c6ced5c866e26f08d2e484eeaf35e (diff) | |
| download | qtxmlpatterns-1cad275b6103ce834c9e1ec5d187e7e97e80a119.tar.gz qtxmlpatterns-1cad275b6103ce834c9e1ec5d187e7e97e80a119.tar.bz2 qtxmlpatterns-1cad275b6103ce834c9e1ec5d187e7e97e80a119.zip | |
Filetree-example: Fix sort order.upstream/5.2.1
The debug version of the algorithm in MSVC performs a check
on the less-than function (if a < b, b < a should be false).
Always returning QXmlNodeModelIndex::Precedes fails that.
Task-number: QTBUG-35525
Change-Id: I2ad030284eb76fd07427ffb710b3d3afd63103e5
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| -rw-r--r-- | examples/xmlpatterns/filetree/filetree.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/xmlpatterns/filetree/filetree.cpp b/examples/xmlpatterns/filetree/filetree.cpp index e1e5427..5df6afb 100644 --- a/examples/xmlpatterns/filetree/filetree.cpp +++ b/examples/xmlpatterns/filetree/filetree.cpp @@ -276,13 +276,13 @@ FileTree::kind(const QXmlNodeModelIndex &node) const /*! No order is defined for this example, so we always return - QXmlNodeModelIndex::Precedes, just to keep everyone happy. + QXmlNodeModelIndex::Is, just to keep everyone happy. */ QXmlNodeModelIndex::DocumentOrder FileTree::compareOrder(const QXmlNodeModelIndex&, const QXmlNodeModelIndex&) const { - return QXmlNodeModelIndex::Precedes; + return QXmlNodeModelIndex::Is; } /*! |