summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_s60.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-04 02:06:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-04 02:06:31 (GMT)
commitebfe394f21174b2ab1c37e809d2c35eb0de84508 (patch)
tree65d97c26741b52c83a315ef1b2ed713dee0a08dd /src/gui/text/qfontengine_s60.cpp
parent92f06c223ba2457e74944a786bed629bdf00ca4b (diff)
parent5d809703aa2d2a08ae7e9610fd42025b081d3d0c (diff)
downloadQt-ebfe394f21174b2ab1c37e809d2c35eb0de84508.zip
Qt-ebfe394f21174b2ab1c37e809d2c35eb0de84508.tar.gz
Qt-ebfe394f21174b2ab1c37e809d2c35eb0de84508.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNetworkRequest autotest: adapt to new cookie parsing (re. commas) Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.
Diffstat (limited to 'src/gui/text/qfontengine_s60.cpp')
0 files changed, 0 insertions, 0 deletions