Go to file
Martin Petersson 483807d4f2 emit QNetWorkAccessManager::finished on QNetworkReply::abort()
If we can not get online when the request is made then we are in the
WaitingForSession state. This will happen for example if the device
is in flight mode. This fix follows the same logic as in
_q_networkSessionFailed, but we should look into why we have the
WaitingForSession check in finished().

Task-number: QT-4747
Reviewed-by: Markus Goetz
(cherry picked from commit 0c9cb9a34d6b472cb53bf1af4616af55b593b616)
2011-05-11 16:39:59 +02:00
bin Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging 2011-05-11 18:18:18 +10:00
config.profiles Fixed Qt UDA creation for Symbian 2011-05-10 12:54:47 +02:00
config.tests Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
demos Move private headers into versioned subdirectory 2011-05-02 15:30:08 +02:00
dist Changelog: Qt Designer 4.8 2011-05-05 16:17:50 +02:00
doc/src Removing the "resetInternalData" slot in QAbstractProxyModel 2011-05-10 12:54:49 +02:00
examples Removed examples and demos that are no longer in qtbase. 2011-04-27 12:06:02 +02:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Massively update the hurd-g++ mkspec. 2011-05-10 12:54:56 +02:00
qmake don't ignore create_prl for static plugins 2011-05-11 16:39:47 +02:00
src emit QNetWorkAccessManager::finished on QNetworkReply::abort() 2011-05-11 16:39:59 +02:00
tests Fix spelling mistake 2011-05-11 16:39:13 +02:00
tools Fix the build of configure.exe. 2011-05-10 12:54:54 +02:00
util Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
.gitattributes Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
.gitignore Add QT_xxx_VERSION macros for each library in qtbase 2011-05-10 15:15:15 +02:00
.tag Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
configure Don't run XLib check if -no-gui is used 2011-05-11 16:39:54 +02:00
configure.exe new configure.exe binary 2011-05-03 14:49:38 +02:00
header.BSD Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
header.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
header.LGPL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
header.LGPL-ONLY Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
INSTALL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LGPL_EXCEPTION.txt Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.LGPL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.PREVIEW.COMMERCIAL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qtbase.pro tests: enable compilation of autotests for qtbase by default 2011-05-11 11:52:24 +10:00
sync.profile Add QT_xxx_VERSION macros for each library in qtbase 2011-05-10 15:15:15 +02:00