diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-08 21:52:13 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-08 21:52:13 (GMT) |
commit | 3f45860bfddc886a2f0985faf1a42b921d275caf (patch) | |
tree | c87df8c81d70010f26e8a1534866a391cd7fdf43 /src/gui/graphicsview | |
parent | 23f3c92081a8afd6ff4be352fee407817950e72f (diff) | |
parent | 75f0c1f0f0496ae22ed89b996dfb0050defd0f3e (diff) | |
download | Qt-3f45860bfddc886a2f0985faf1a42b921d275caf.zip Qt-3f45860bfddc886a2f0985faf1a42b921d275caf.tar.gz Qt-3f45860bfddc886a2f0985faf1a42b921d275caf.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:
QUrl: fix parsing of IRIs with more than one IDN label
QUrl: update the whitelist of IDN domains
Diffstat (limited to 'src/gui/graphicsview')
0 files changed, 0 insertions, 0 deletions