summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-11-23 14:30:51 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-11-30 11:55:55 (GMT)
commitec1526a73fef7d95268437204fa8534085940fbc (patch)
treeab288eb0ef7b317ebc85c8e341a77973d26ca73f
parentb0fb70cd74ef1453a36169088e6f283206818d78 (diff)
downloadQt-ec1526a73fef7d95268437204fa8534085940fbc.zip
Qt-ec1526a73fef7d95268437204fa8534085940fbc.tar.gz
Qt-ec1526a73fef7d95268437204fa8534085940fbc.tar.bz2
Fix compile error on symbian
Symbian doesn't have file owners, the resolveUserName / resolveGroupName functions have been correctly moved to unix only scope which caused a compile error. This change makes the QFSFileEngine::owner[Id] return -2 / QString() for symbian directly. Reviewed-by: Markus Goetz
-rw-r--r--src/corelib/io/qfsfileengine_unix.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 035e78f..55388e6 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -861,9 +861,13 @@ uint QFSFileEngine::ownerId(FileOwner own) const
QString QFSFileEngine::owner(FileOwner own) const
{
+#ifndef Q_OS_SYMBIAN
if (own == OwnerUser)
return QFileSystemEngine::resolveUserName(ownerId(own));
return QFileSystemEngine::resolveGroupName(ownerId(own));
+#else
+ return QString();
+#endif
}
bool QFSFileEngine::setPermissions(uint perms)