diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:17:06 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:21:34 +0200 |
| commit | d9e4b5c1820e62700756ede2ef5290baccc3c1b2 (patch) | |
| tree | cc6975c1bd3ea86e4b7e5373560603e5165b7ff4 /src/quick/util/qquicklistcompositor.cpp | |
| parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
| parent | fb7ab18fa799032f37fd6f78ab34b76aff91ed6c (diff) | |
Merge branch 'stable' into release
Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
Diffstat (limited to 'src/quick/util/qquicklistcompositor.cpp')
| -rw-r--r-- | src/quick/util/qquicklistcompositor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/util/qquicklistcompositor.cpp b/src/quick/util/qquicklistcompositor.cpp index 84ba43f30e..a9e9acee23 100644 --- a/src/quick/util/qquicklistcompositor.cpp +++ b/src/quick/util/qquicklistcompositor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -336,7 +336,7 @@ inline QQuickListCompositor::Range *QQuickListCompositor::erase( } /*! - Sets the the number (\a count) of possible groups that items may belong to in a compositor. + Sets the number (\a count) of possible groups that items may belong to in a compositor. */ void QQuickListCompositor::setGroupCount(int count) |