diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-28 12:27:08 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-28 13:53:02 +0100 |
| commit | 6de0082f549b52bad8852160cc350fa0d59ede17 (patch) | |
| tree | 88016da9c38351cb4fdc46a1208d3c25b034d713 | |
| parent | c1a2a3b82f3c017b07db908b934f2ace8e14a7e0 (diff) | |
Interpret "~" as home directory shortcut when resolving wildcards.
This is currently not done for group prefixes.
Task-number: QBS-516
Change-Id: I2e973ada0d91b17e3cdb4b9d7df3f8d2f79e638c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/corelib/language/language.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 695e09364..6c649d0f3 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -1025,8 +1025,11 @@ QSet<QString> SourceWildCards::expandPatterns(const GroupConstPtr &group, const QStringList &patterns, const QString &baseDir) const { QSet<QString> files; + QString expandedPrefix = prefix; + if (expandedPrefix.startsWith(QLatin1String("~/"))) + expandedPrefix.replace(0, 1, QDir::homePath()); foreach (QString pattern, patterns) { - pattern.prepend(prefix); + pattern.prepend(expandedPrefix); pattern.replace(QLatin1Char('\\'), QLatin1Char('/')); QStringList parts = pattern.split(QLatin1Char('/'), QString::SkipEmptyParts); if (FileInfo::isAbsolute(pattern)) { |