summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-29 08:59:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-29 08:59:32 (GMT)
commitc02ef9eb331f03dbd59d2fd938c53b54f5c65cea (patch)
tree93defa0a21c2ecc1261c5d549087916a69cb4f55 /src/declarative/graphicsitems
parent60d37c9c2f99ee1b10293c4dbc0264664dd8cad0 (diff)
parent60948c48adc376cefa774bd101de34c60db52dea (diff)
downloadQt-c02ef9eb331f03dbd59d2fd938c53b54f5c65cea.zip
Qt-c02ef9eb331f03dbd59d2fd938c53b54f5c65cea.tar.gz
Qt-c02ef9eb331f03dbd59d2fd938c53b54f5c65cea.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: (25 commits) QNAM: Fix doc rendering of QNetworkRequest remove the connecting thread, and use async call to dbus instead. QScriptValue::construct(): Don't crash if function throws non-Object Network code: Fix code comment spellchecking errors. QNAM: fix build QNAM HTTP: Remove the error() of QHttpNetworkConnection QNAM HTTP: Remove enableEncryption() QNAM HTTP: Remove unused code QNAM HTTP: Move authenticationRequired() to QHttpNetworkReply QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReply QNAM HTTP: Move cacheCredentials() to QHttpNetworkReply QNAM HTTP: Use sslErrors() from QHttpNetworkReply QNAM HTTP: Remove Wait4AuthState QNAM: Internal function renaming QNAM HTTP: Internal variable spelling mistakes QNAM HTTP: Pause connection when emitting proxy auth signal QNAM HTTP: Also pause connection when emitting sslErrors() QNAM HTTP: Also resume uploads after connection pause QNAM HTTP: Process authenticationRequired() from HTTP properly QNAM HTTP: Pause sockets while emitting to user code. ...
Diffstat (limited to 'src/declarative/graphicsitems')
0 files changed, 0 insertions, 0 deletions