diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 16:28:37 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 16:28:37 (GMT) |
| commit | ff01e5cca39fb418f21cc8b06885178600a84f56 (patch) | |
| tree | 42c90395be05db3359d0ad942f1ea6690f9c30c6 /src/gui | |
| parent | 481f5f0146261864bddf7f25fbba4c6ae35a3afa (diff) | |
| download | Qt-ff01e5cca39fb418f21cc8b06885178600a84f56.zip Qt-ff01e5cca39fb418f21cc8b06885178600a84f56.tar.gz Qt-ff01e5cca39fb418f21cc8b06885178600a84f56.tar.bz2 | |
Remove support for tilde expansion as there is no home on INTEGRITY.
Instead of removing each use of the function, make the function do
nearly nothing. If home support gets added (it is actually there when
user/group support is present with full-posix mode is used), then
this is trivial to remove.
Also, keeps changes minimal.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 817cd38..8b76dac 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -869,6 +869,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded if (!path.startsWith(QLatin1Char('~'))) return path; QString ret = path; +#if defined(Q_OS_INTEGRITY) QStringList tokens = ret.split(QDir::separator()); if (tokens.first() == QLatin1String("~")) { ret.replace(0, 1, QDir::homePath()); @@ -899,6 +900,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded } if (expanded != 0) *expanded = true; +#endif return ret; } #endif |