diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-04-12 12:18:29 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-04-12 12:18:29 (GMT) |
| commit | 04d1cbce75e77392077ce4ae014fe8774c32a8fc (patch) | |
| tree | d8e52dbced2f087d75e3889d7d2c0b3c19f98570 /src/corelib/io | |
| parent | f62e846c7ebe243a2a36e7577d070f1275f2ec47 (diff) | |
| parent | d01f82879dd4d40ece8afb54d6d25f1ef9e35624 (diff) | |
| download | Qt-04d1cbce75e77392077ce4ae014fe8774c32a8fc.zip Qt-04d1cbce75e77392077ce4ae014fe8774c32a8fc.tar.gz Qt-04d1cbce75e77392077ce4ae014fe8774c32a8fc.tar.bz2 | |
Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network
Conflicts:
configure.exe
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/io.pri | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemiterator_symbian.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 2b61192..f67600d 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -110,7 +110,7 @@ win32 { SOURCES += io/qfilesystemwatcher_symbian.cpp HEADERS += io/qfilesystemwatcher_symbian_p.h INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE - LIBS += -lplatformenv + LIBS += -lplatformenv -lesock } } integrity { diff --git a/src/corelib/io/qfilesystemiterator_symbian.cpp b/src/corelib/io/qfilesystemiterator_symbian.cpp index 23c726a..a39f9c3 100644 --- a/src/corelib/io/qfilesystemiterator_symbian.cpp +++ b/src/corelib/io/qfilesystemiterator_symbian.cpp @@ -88,8 +88,6 @@ QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &path, QDir::Fil else if (symbianMask == 0) { if ((filters & QDir::PermissionMask) == QDir::Writable) symbianMask = KEntryAttMatchExclude | KEntryAttReadOnly; - else if ((filters & QDir::PermissionMask) == QDir::Readable) - symbianMask = KEntryAttMatchExclusive | KEntryAttReadOnly; } lastError = dirHandle.Open(fs, qt_QString2TPtrC(absPath), symbianMask); |