aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-06-25 23:32:04 +0300
committerOrgad Shaneh <orgads@gmail.com>2013-06-27 12:53:03 +0200
commit76c30832de2dc363b5d518a06ca19031f43bfab0 (patch)
tree98757c751ef0dcc497db64f16cfe39ccffd253bc
parent273dfa32e21423ea70fdf1b987714efe7e102cc4 (diff)
FileName: Support "~ -> homePath" substitution
Change-Id: Ie1ca69582cfd8893b0616e51d2d5c1b13e987b69 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
-rw-r--r--src/libs/utils/fileutils.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index f39e5b4751..e9b1f90683 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -480,7 +480,10 @@ FileName FileName::fromString(const QString &filename)
/// \a fileName is only passed through QDir::cleanPath
FileName FileName::fromUserInput(const QString &filename)
{
- return FileName(QDir::cleanPath(filename));
+ QString clean = QDir::cleanPath(filename);
+ if (clean.startsWith(QLatin1String("~/")))
+ clean = QDir::homePath() + clean.midRef(1);
+ return FileName(clean);
}
FileName::FileName(const QString &string)