diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-06-09 11:55:14 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-06-09 11:55:14 (GMT) |
| commit | fc2a790e96be47b4da3e308c5e0272e4840a2618 (patch) | |
| tree | 4c1cd7998777252463a060d4ce73f284441d7c22 /src/corelib/io/io.pri | |
| parent | 7b4e52045d17bcc4b3bb1e0973c3af2e48381c5e (diff) | |
| parent | 3916feefc5ebadba3320029a29ecf02d8934e879 (diff) | |
| download | Qt-fc2a790e96be47b4da3e308c5e0272e4840a2618.zip Qt-fc2a790e96be47b4da3e308c5e0272e4840a2618.tar.gz Qt-fc2a790e96be47b4da3e308c5e0272e4840a2618.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
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 f67600d..e411f8f 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 \ |