feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Environment, expandVariables() can return native separators

Browse Source 
Convert to '/' at the right place.
This commit is contained in:
dt_
2011-04-29 13:39:43 +02:00
parent 8304b96ae9
commit f6148f6d45
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/environment.cpp
View File

@@ -219,7 +219,7 @@ QString Environment::searchInPath(const QStringList &executables,
const QStringList &additionalDirs) const const QStringList &additionalDirs) const
{ {
foreach (const QString &executable, executables) { foreach (const QString &executable, executables) {
QString exec = expandVariables(executable); QString exec = QDir::cleanPath(expandVariables(executable));
if (exec.isEmpty()) if (exec.isEmpty())
continue; continue;

2
src/libs/utils/pathchooser.cpp
View File

@@ -217,7 +217,7 @@ QString PathChooserPrivate::expandedPath(const QString &input) const
{ {
if (input.isEmpty()) if (input.isEmpty())
return input; return input;
const QString path = QDir::fromNativeSeparators(m_environment.expandVariables(input)); const QString path = QDir::cleanPath(m_environment.expandVariables(input));
if (path.isEmpty()) if (path.isEmpty())
return path; return path;