From 2a86cb134a5204ca5103dac32b3212ed416a89e2 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 23 Sep 2010 10:28:39 +0200
Subject: [PATCH] PathChooser: Fix some regressions
Task-Nr: QTCREATORBUG-2409
---
src/libs/utils/pathchooser.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index c0abba1484a..db6a0129fe3 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -156,10 +156,12 @@ void PathChooser::setBaseDirectory(const QString &directory)
QString PathChooser::path() const
{
const QString path = m_d->m_lineEdit->text();
- if (!m_d->m_baseDirectory.isEmpty() && QFileInfo(path).isRelative())
+ if (!m_d->m_baseDirectory.isEmpty()
+ && QFileInfo(path).isRelative()
+ && !path.isEmpty())
return QFileInfo(m_d->m_baseDirectory + QLatin1Char('/') + path).absoluteFilePath();
else
- return QFileInfo(path).absoluteFilePath();
+ return QDir::fromNativeSeparators(path);
}
void PathChooser::setPath(const QString &path)
--
GitLab