diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-29 14:51:25 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-29 14:51:25 (GMT) |
| commit | 9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a (patch) | |
| tree | 24c920bbba7bc5d2d7dedd7c5a8756376f3c7b4b /src/network | |
| parent | a63298440dcddc844554e012434c3331ca239db4 (diff) | |
| parent | d51939831552ef73e8f33365c1ef77322594512c (diff) | |
| download | Qt-9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a.zip Qt-9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a.tar.gz Qt-9b707c0a12e01f8b0c4432b6a5d391b8699cfd3a.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 11e1e46..bcbeef1 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -477,7 +477,8 @@ void QNetworkAccessManager::setCache(QAbstractNetworkCache *cache) if (d->networkCache != cache) { delete d->networkCache; d->networkCache = cache; - d->networkCache->setParent(this); + if (d->networkCache) + d->networkCache->setParent(this); } } |