From 7a0baf65e7adb1139e2e2e3d3d65eefd56d7b229 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Wed, 15 Apr 2009 19:07:25 +0200
Subject: [PATCH] Don't annoy Windows users with alien dir separators
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index fe4e3d48770..6086c5ba4b3 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -404,7 +404,7 @@ QtDirWidget::QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defau
const QtVersion * const version = m_versions.at(i);
QTreeWidgetItem *item = new QTreeWidgetItem(m_ui.qtdirList);
item->setText(0, version->name());
- item->setText(1, version->path());
+ item->setText(1, QDir::toNativeSeparators(version->path()));
item->setData(0, Qt::UserRole, version->uniqueId());
if (version->isValid()) {
@@ -506,7 +506,7 @@ void QtDirWidget::addQtDir()
QTreeWidgetItem *item = new QTreeWidgetItem(m_ui.qtdirList);
item->setText(0, newVersion->name());
- item->setText(1, newVersion->path());
+ item->setText(1, QDir::toNativeSeparators(newVersion->path()));
item->setData(0, Qt::UserRole, newVersion->uniqueId());
item->setData(2, Qt::DecorationRole, QIcon());
@@ -606,9 +606,9 @@ void QtDirWidget::showEnvironmentPage(QTreeWidgetItem *item)
makeMingwVisible(false);
if (!m_versions.at(index)->isInstalled())
m_ui.errorLabel->setText(tr("The Qt Version is not installed. Run make install")
- .arg(m_versions.at(index)->path()));
+ .arg(QDir::toNativeSeparators(m_versions.at(index)->path())));
else
- m_ui.errorLabel->setText(tr("%1 is not a valid qt directory").arg(m_versions.at(index)->path()));
+ m_ui.errorLabel->setText(tr("%1 is not a valid qt directory").arg(QDir::toNativeSeparators(m_versions.at(index)->path())));
} else { //ProjectExplorer::ToolChain::GCC
m_ui.msvcComboBox->setVisible(false);
makeMingwVisible(false);
@@ -734,7 +734,7 @@ void QtDirWidget::updateCurrentQtPath()
if (m_versions[currentItemIndex]->path() == m_ui.qtPath->path())
return;
m_versions[currentItemIndex]->setPath(m_ui.qtPath->path());
- currentItem->setText(1, m_versions[currentItemIndex]->path());
+ currentItem->setText(1, QDir::toNativeSeparators(m_versions[currentItemIndex]->path()));
showEnvironmentPage(currentItem);
--
GitLab