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

PathChooser: Fix some regressions

Browse Source 
Task-Nr: QTCREATORBUG-2409
This commit is contained in:
dt
2010-09-23 10:28:39 +02:00
parent 6b665ac991
commit 2a86cb134a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,10 +156,12 @@ void PathChooser::setBaseDirectory(const QString &directory)
QString PathChooser::path() const QString PathChooser::path() const
{ {
const QString path = m_d->m_lineEdit->text(); 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(); return QFileInfo(m_d->m_baseDirectory + QLatin1Char('/') + path).absoluteFilePath();
else else
return QFileInfo(path).absoluteFilePath(); return QDir::fromNativeSeparators(path);
} }
void PathChooser::setPath(const QString &path) void PathChooser::setPath(const QString &path)