diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-09 12:17:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-09 12:17:29 (GMT) |
| commit | 20a3f5a4748f04d8a584040256755af7f97e870d (patch) | |
| tree | 53576dbebfb781b46f08825ec7950507a724e223 /src | |
| parent | db934a4e287f083f41e6a6ad1d48bbf223588efa (diff) | |
| parent | 0c9cb9a34d6b472cb53bf1af4616af55b593b616 (diff) | |
| download | Qt-20a3f5a4748f04d8a584040256755af7f97e870d.zip Qt-20a3f5a4748f04d8a584040256755af7f97e870d.tar.gz Qt-20a3f5a4748f04d8a584040256755af7f97e870d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
Fix -no-gui
Don't run XLib check if -no-gui is used
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 069755f..09fab51 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -775,6 +775,8 @@ void QNetworkReplyImpl::abort() if (d->state != QNetworkReplyImplPrivate::Finished) { // emit signals d->error(OperationCanceledError, tr("Operation canceled")); + if (d->state == QNetworkReplyImplPrivate::WaitingForSession) + d->state = QNetworkReplyImplPrivate::Working; d->finished(); } d->state = QNetworkReplyImplPrivate::Aborted; diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index e778ab7..42499dd 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -7,9 +7,9 @@ unix:!symbian { SUBDIRS *= codecs } !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines -!embedded:SUBDIRS *= graphicssystems +!embedded:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers -!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods +!win32:!embedded:!mac:!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS *= inputmethods !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon |