diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-02-22 15:27:59 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-22 15:27:59 (GMT) |
| commit | fa033bb0bc36737908375906bc47ac83300b0b5c (patch) | |
| tree | 962765cb4b07c7c40b96d3e87c21d10a10a402f8 /src/gui/dialogs | |
| parent | debca4dfbb45ee3f16c49e13f904efc0c589e4f1 (diff) | |
| download | Qt-fa033bb0bc36737908375906bc47ac83300b0b5c.zip Qt-fa033bb0bc36737908375906bc47ac83300b0b5c.tar.gz Qt-fa033bb0bc36737908375906bc47ac83300b0b5c.tar.bz2 | |
Various INTEGRITY fixes
Small-ish compilation fixes.
Note that "Value" is a reserved word on INTEGRITY, so we need to use the correct
namespace.
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfileinfogatherer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp index 12e77b1..b36b21e 100644 --- a/src/gui/dialogs/qfileinfogatherer.cpp +++ b/src/gui/dialogs/qfileinfogatherer.cpp @@ -78,11 +78,11 @@ QFileInfoGatherer::QFileInfoGatherer(QObject *parent) #endif m_resolveSymlinks(false), m_iconProvider(&defaultProvider) { -#ifndef Q_OS_WIN +#ifdef Q_OS_WIN + m_resolveSymlinks = true; +#elif !defined(Q_OS_INTEGRITY) userId = getuid(); groupId = getgid(); -#else - m_resolveSymlinks = true; #endif #ifndef QT_NO_FILESYSTEMWATCHER watcher = new QFileSystemWatcher(this); |