diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 10:26:14 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 10:26:14 +0200 |
| commit | 5c45c66b1743645b77826ad61508a79eadd48414 (patch) | |
| tree | 6e1939a716b2a8e2f45c4d2fb396ca16118e18cb /src/gui/text/qtextobject.cpp | |
| parent | 955189bf5ee3a00a82b016870a6d704be03d6934 (diff) | |
| parent | a30ad513df3af7e558d079df405a90e8601d2e74 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed a compile error on Mac.
QNAM HTTP: Fix a warning
QNAM: Move a qRegisterMetaType
QNAM: New QNetworkReply::setFinished() protected function
A few tiny improvements to the QDeclarativeXMLHTTPRequest.
Added encoding conversion functions to QStringRef.
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
0 files changed, 0 insertions, 0 deletions