diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 14:01:31 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 14:01:31 (GMT) |
commit | 9b648cc6f0354d0d7a36f453c3c997a08bbb6452 (patch) | |
tree | b293580c775a29984eb1749d648e256ea0984ac4 /src | |
parent | 03eae990b1aea880ee863061e1429edc4a96c626 (diff) | |
parent | d36be1232e4f11cf5dc121bb60c628970b88ac2a (diff) | |
download | Qt-9b648cc6f0354d0d7a36f453c3c997a08bbb6452.zip Qt-9b648cc6f0354d0d7a36f453c3c997a08bbb6452.tar.gz Qt-9b648cc6f0354d0d7a36f453c3c997a08bbb6452.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Diffstat (limited to 'src')
-rw-r--r-- | src/network/access/qnetworkaccessbackend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 8ac64d2..4273e10 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -72,7 +72,7 @@ Q_GLOBAL_STATIC(QNetworkAccessBackendFactoryData, factoryData) QNetworkAccessBackendFactory::QNetworkAccessBackendFactory() { QMutexLocker locker(&factoryData()->mutex); - factoryData()->prepend(this); + factoryData()->append(this); } QNetworkAccessBackendFactory::~QNetworkAccessBackendFactory() |