projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe0ae9f eb44ca5)
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)
* '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

1  2 
tests/auto/qurl/tst_qurl.cpp patch | diff1 | diff2 | blob | history

diff --cc tests/auto/qurl/tst_qurl.cpp
Simple merge
Domain: UI Framework / Uncategorized;