Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 May 2011 11:43:46 +0000 (21:43 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 May 2011 11:43:46 +0000 (21:43 +1000)
commite60f05201f5bc412ec8c02625bcbbca5ba50812c
tree68d5af1df341b622d715fa3b4986767727e2b931
parentfe0ae9fd2a59a29b42fefd8cacdf8b79cbf696e9
parenteb44ca51f19a2218cfef3481429eb571e1fc46e5
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  QUrl auto test: include core-private headers
  QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."
  Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore
tests/auto/qurl/tst_qurl.cpp