diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 21:43:46 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 21:43:46 +1000 |
| commit | e60f05201f5bc412ec8c02625bcbbca5ba50812c (patch) | |
| tree | 68d5af1df341b622d715fa3b4986767727e2b931 /src/corelib/io/io.pri | |
| parent | fe0ae9fd2a59a29b42fefd8cacdf8b79cbf696e9 (diff) | |
| parent | eb44ca51f19a2218cfef3481429eb571e1fc46e5 (diff) | |
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
Diffstat (limited to 'src/corelib/io/io.pri')
| -rw-r--r-- | src/corelib/io/io.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index f67600d750..e411f8f643 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -24,6 +24,8 @@ HEADERS += \ io/qresource_p.h \ io/qresource_iterator_p.h \ io/qurl.h \ + io/qurltlds_p.h \ + io/qtldurl_p.h \ io/qsettings.h \ io/qsettings_p.h \ io/qfsfileengine.h \ @@ -41,6 +43,7 @@ SOURCES += \ io/qbuffer.cpp \ io/qdatastream.cpp \ io/qdataurl.cpp \ + io/qtldurl.cpp \ io/qdebug.cpp \ io/qdir.cpp \ io/qdiriterator.cpp \ |