summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qurl.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-21 12:47:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-21 12:47:41 (GMT)
commit2ae6b44e4242c60bd882661e104bb53fa6670556 (patch)
tree024f8e72fcafda1698d5929de52b92f6f4d94279 /src/corelib/io/qurl.h
parentbd4cbc57ee6b3d2721a51932f4eaea8d8b07f04f (diff)
parentaf30aeb6a1ebb7307f06c122c0c93d152f4d958c (diff)
downloadQt-2ae6b44e4242c60bd882661e104bb53fa6670556.zip
Qt-2ae6b44e4242c60bd882661e104bb53fa6670556.tar.gz
Qt-2ae6b44e4242c60bd882661e104bb53fa6670556.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtHelp: Enable dynamic translation. Designer: Fixed a crash when previewing in a non-existent style. uic3: Introduced option to preserve layout object names of Designer 3.
Diffstat (limited to 'src/corelib/io/qurl.h')
0 files changed, 0 insertions, 0 deletions