diff options
| -rw-r--r-- | src/shared/proparser/profileevaluator.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index f60c6afa2c..99f4fe0262 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -83,7 +83,7 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::fixifiedValues( foreach (const ProString &str, d->values(ProKey(variable))) { const QString &el = d->m_option->expandEnvVars(str.toQString()); if (IoUtils::isAbsolutePath(el)) { - result << SourceFile{ el, str.sourceFile() }; + result << SourceFile{ QDir::cleanPath(el), str.sourceFile() }; } else { QString fn = QDir::cleanPath(baseDirectory + QLatin1Char('/') + el); if (IoUtils::exists(fn)) @@ -132,16 +132,17 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::absoluteFileValues( const QString &el = d->m_option->expandEnvVars(str.toQString()); QString absEl; if (IoUtils::isAbsolutePath(el)) { - if (m_vfs->exists(el, flags)) { - result << SourceFile{ el, str.sourceFile() }; + QString fn = QDir::cleanPath(el); + if (m_vfs->exists(fn, flags)) { + result << SourceFile{ fn, str.sourceFile() }; goto next; } - absEl = el; + absEl = fn; } else { foreach (const QString &dir, searchDirs) { QString fn = QDir::cleanPath(dir + QLatin1Char('/') + el); if (m_vfs->exists(fn, flags)) { - result << SourceFile{ QDir::cleanPath(fn), str.sourceFile() }; + result << SourceFile{ fn, str.sourceFile() }; goto next; } } |