diff options
| -rw-r--r-- | src/corelib/io/qfilesystemengine_symbian.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemiterator_symbian.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemmetadata_p.h | 4 | ||||
| -rw-r--r-- | tests/auto/qfilesystementry/tst_qfilesystementry.cpp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/io/qfilesystemengine_symbian.cpp b/src/corelib/io/qfilesystemengine_symbian.cpp index 1205274..759aafd 100644 --- a/src/corelib/io/qfilesystemengine_symbian.cpp +++ b/src/corelib/io/qfilesystemengine_symbian.cpp @@ -41,7 +41,7 @@ #include "qfilesystemengine_p.h" #include "qfsfileengine.h" -#include "qcore_symbian_p.h" +#include <QtCore/private/qcore_symbian_p.h> #include <f32file.h> diff --git a/src/corelib/io/qfilesystemiterator_symbian.cpp b/src/corelib/io/qfilesystemiterator_symbian.cpp index 9093599..106eda9 100644 --- a/src/corelib/io/qfilesystemiterator_symbian.cpp +++ b/src/corelib/io/qfilesystemiterator_symbian.cpp @@ -41,7 +41,7 @@ #include "qfilesystemiterator_p.h" #include "qfilesystemengine_p.h" -#include "qcore_symbian_p.h" +#include <QtCore/private/qcore_symbian_p.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index a506fa4..1164d42 100644 --- a/src/corelib/io/qfilesystemmetadata_p.h +++ b/src/corelib/io/qfilesystemmetadata_p.h @@ -62,7 +62,7 @@ #if defined(Q_OS_WIN) #elif defined(Q_OS_SYMBIAN) #include <f32file.h> -#include "qdatetime_p.h" +#include <QtCore/private/qdatetime_p.h> #else #endif @@ -253,6 +253,8 @@ struct QFileSystemMetaData } uint userId() const { return (uint) -2; } uint groupId() const { return (uint) -2; } + QString user() const { return QString(); } + QString group() const { return QString(); } uint ownerId(QAbstractFileEngine::FileOwner owner) const { Q_UNUSED(owner); diff --git a/tests/auto/qfilesystementry/tst_qfilesystementry.cpp b/tests/auto/qfilesystementry/tst_qfilesystementry.cpp index 267fa8c..e00a214 100644 --- a/tests/auto/qfilesystementry/tst_qfilesystementry.cpp +++ b/tests/auto/qfilesystementry/tst_qfilesystementry.cpp @@ -114,7 +114,7 @@ void tst_QFileSystemEntry::getSetCheck_data() QTest::newRow("absolutePath") << QString("A:dir\\without\\leading\\backslash.bat") << absPrefix + QString("A:\\dir\\without\\leading\\backslash.bat") - << "A:dir/without/leading/backslash.bat" << "backslash.bat" << << "backslash" << "backslash" << "bat" << "bat" << true; + << "A:dir/without/leading/backslash.bat" << "backslash.bat" << "backslash" << "backslash" << "bat" << "bat" << true; } void tst_QFileSystemEntry::getSetCheck() |