diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-19 13:49:33 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-19 13:49:33 (GMT) |
| commit | 42567d2e4d85e001f77767cabea8acb06daeb94d (patch) | |
| tree | 96c6e3241f322535834633b883808e3e44196495 /src/corelib/tools | |
| parent | b91d336573c9bfb2e7c93286a8e0b36e742bd775 (diff) | |
| parent | 0f01ad8c73e352a8368296820f4dd77f9da06114 (diff) | |
| download | Qt-42567d2e4d85e001f77767cabea8acb06daeb94d.zip Qt-42567d2e4d85e001f77767cabea8acb06daeb94d.tar.gz Qt-42567d2e4d85e001f77767cabea8acb06daeb94d.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index c98c5e9..261c369 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -112,7 +112,7 @@ class QList public: inline QList() : d(&QListData::shared_null) { d->ref.ref(); } inline QList(const QList<T> &l) : d(l.d) { d->ref.ref(); if (!d->sharable) detach_helper(); } - ~QList(); // ### Qt5: make this destructor virtual + ~QList(); QList<T> &operator=(const QList<T> &l); bool operator==(const QList<T> &l) const; inline bool operator!=(const QList<T> &l) const { return !(*this == l); } |