diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
| commit | dbafabb019eac6ab21b43279b3a348e4afbd065e (patch) | |
| tree | 24245148e3f0b948df06823d879f9158d1b81d2f /src/corelib/tools | |
| parent | 00b96399e6d3bcd7a1081721cafeb15da3ab9781 (diff) | |
| parent | 9de2853a942529f88815ed29375ff4efc44d168c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qset.qdoc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index e66a59a09c..ab7d72611e 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -621,9 +621,6 @@ unless you need to change the QSet through the iterator. Const iterators are slightly faster, and can improve code readability. - QSet\<T\>::iterator allows you to iterate over a QSet\<T\> and - modify it as you go (using QSet::erase()). However, - The default QSet::iterator constructor creates an uninitialized iterator. You must initialize it using a function like QSet::begin(), QSet::end(), or QSet::insert() before you can |