diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:19:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:19:20 (GMT) |
| commit | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (patch) | |
| tree | 4dd5ef7c208534607895012ff99af03b2c553f0f /src/corelib | |
| parent | 800c9df03328db934ccadb94fe75c684ed282aa1 (diff) | |
| parent | 11084503c711f862baa4d4027a7b97cedae1034e (diff) | |
| download | Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.zip Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.tar.gz Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed compilation.
Re-apply licenseheader text in source files for qt4.7
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
Fixed bug in meego graphics system runtime switching.
Fix memory leak in QXmlQuery::setQuery.
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
doc: Fixed QTBUG-19226
doc: Fixed QTBUG-19223
doc: Remved debug code for QTBUG-18791
doc: Fixed QTBUG-18791
doc: Fixed a QML snippet reference
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlist.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index e6f041f..4eb05d6 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -641,6 +641,8 @@ Q_OUTOFLINE_TEMPLATE QList<T> QList<T>::mid(int pos, int alength) const if (pos == 0 && alength == size()) return *this; QList<T> cpy; + if (alength <= 0) + return cpy; cpy.reserve(alength); cpy.d->end = alength; QT_TRY { |