diff options
| author | axis <qt-info@nokia.com> | 2010-01-26 13:53:12 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-26 13:53:12 (GMT) |
| commit | fa81d43f8bba47286e3f16b7aa092822c7bd5f7e (patch) | |
| tree | 2ae250485fa9191c07894a6bf02c8d154f3b0bd3 /src/corelib | |
| parent | d64407cf376c5723663ebe81f156a3da98d7df24 (diff) | |
| parent | 9175f9e5bad0f77e5d53751a8e839c8ea7df4c23 (diff) | |
| download | Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.zip Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.gz Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/common/symbian/symbian.conf
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 74e5f74..a131d6c 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -5932,7 +5932,7 @@ void QUrl::detach() */ bool QUrl::isDetached() const { - return d && d->ref == 1; + return !d || d->ref == 1; } diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 4049925..556093f 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -561,6 +561,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) d->ref = 1; d->alloc = d->size = len; d->data = d->array; + d->array[len] = 0; return QByteArray(d.take(), 0, 0); |