diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 11:53:07 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 11:53:07 (GMT) |
| commit | 15b08dffc1354bc816b04901a7442679382b0935 (patch) | |
| tree | 783af85b75f9de3ab10902c5ba66cf5e22b2fe61 /src/corelib/io/io.pri | |
| parent | 9f5b02406f38fe02a27de7843b9f8a11232d2064 (diff) | |
| parent | 9d174f13e48730ac06aa429e0f011a02b333025e (diff) | |
| download | Qt-15b08dffc1354bc816b04901a7442679382b0935.zip Qt-15b08dffc1354bc816b04901a7442679382b0935.tar.gz Qt-15b08dffc1354bc816b04901a7442679382b0935.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
Diffstat (limited to 'src/corelib/io/io.pri')
| -rw-r--r-- | src/corelib/io/io.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 9178a2e..ef448b1 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -6,6 +6,7 @@ HEADERS += \ io/qbuffer.h \ io/qdatastream.h \ io/qdatastream_p.h \ + io/qdataurl_p.h \ io/qdebug.h \ io/qdir.h \ io/qdiriterator.h \ @@ -34,6 +35,7 @@ SOURCES += \ io/qabstractfileengine.cpp \ io/qbuffer.cpp \ io/qdatastream.cpp \ + io/qdataurl.cpp \ io/qdebug.cpp \ io/qdir.cpp \ io/qdiriterator.cpp \ |