diff options
| author | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-17 13:59:53 (GMT) |
|---|---|---|
| committer | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-17 13:59:53 (GMT) |
| commit | 12e40dc6350ce37a6108c62d3c954a50df621dbd (patch) | |
| tree | 0fd5eb966de7b9124c1af2e9355ce8e594ad7b4d /src/gui/dialogs/qfiledialog.cpp | |
| parent | 574464cd7e2940f2dadc4d556e24b944cf222f3d (diff) | |
| parent | b0d54f150e9b4211e263b4835dd2c64ac07a8c86 (diff) | |
| download | Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.zip Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.tar.gz Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/gui/dialogs/qfiledialog.cpp')
| -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..970d111 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 |