diff options
author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-06-15 12:48:16 +0300 |
---|---|---|
committer | Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> | 2012-06-15 12:33:57 +0200 |
commit | d254d2709d0b89b2686814afe7cd2f79b1ac04c4 (patch) | |
tree | 1420bad1fb4a427a10c1c77e79558487edd65575 | |
parent | 8e55e016434f970cc38d50970571a5a8c3dad047 (diff) | |
download | qt4-tools-d254d2709d0b89b2686814afe7cd2f79b1ac04c4.tar.gz |
Symbian: Fix cherry-pick merge-conflict failure
Fix merge conflict failure of 2410bc406d3ff10dee2a955f97eb49a8d25d8264,
done when cherry-picking 4d5296d18f3e201daf054d715401a011325e909c
(I4b5b36b1d996b98e659d993969006c61b4440c15) from 4.8 to 4.8.1-symbian
branch.
Change-Id: I4b8049b94f55171b3feafff06b431bcf6aa6f3fb
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
-rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index bf24138700..8b94d5f2b4 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -102,7 +102,7 @@ void QNetworkReplyImplPrivate::_q_startOperation() if (session) { Q_Q(QNetworkReplyImpl); - QObject::connect(session, SIGNAL(error(QNetworkSession::SessionError)), + QObject::connect(session.data(), SIGNAL(error(QNetworkSession::SessionError)), q, SLOT(_q_networkSessionFailed())); if (!session->isOpen()) |