aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Shambir <sergey.shambir.auto@gmail.com>2013-01-28 18:15:30 +0400
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-03-11 19:54:52 +0100
commitfa76cbcaa2ce05cb4a60bda3564c1ba3d5959659 (patch)
tree21706e440edbb383bb3c7bfd71eda01bd7b62a53
parent67384c1c8300b67e15e1855d5ef38a2c2ba071b0 (diff)
VCProj: converting dir separator on unix systems
Also added missed <QDebug> header to fix compilation. Change-Id: I763c22673716fd4aeb5d439934eefeee1120b77e Reviewed-by: Radovan Zivkovic <pivonroll@gmail.com>
-rw-r--r--src/plugins/vcprojectmanager/vcprojectnodes.cpp3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectreader.cpp5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/vcprojectmanager/vcprojectnodes.cpp b/src/plugins/vcprojectmanager/vcprojectnodes.cpp
index 62a1c2ce53..bd8c367f60 100644
--- a/src/plugins/vcprojectmanager/vcprojectnodes.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectnodes.cpp
@@ -9,6 +9,7 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <QFileInfo>
+#include <QDir>
using namespace ProjectExplorer;
@@ -112,7 +113,7 @@ void VcProjectNode::refresh(VcProjectInfo::Filter *files)
if (!files)
return;
- QString projectPath = QFileInfo(path()).path();
+ QString projectPath = QFileInfo(path()).path() + QDir::separator();
QList<VcProjectInfo::Filter *> filterQueue;
QList<FolderNode *> parentQueue;
filterQueue.prepend(files);
diff --git a/src/plugins/vcprojectmanager/vcprojectreader.cpp b/src/plugins/vcprojectmanager/vcprojectreader.cpp
index 6c19c29a72..49961365fb 100644
--- a/src/plugins/vcprojectmanager/vcprojectreader.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectreader.cpp
@@ -6,6 +6,8 @@
#include <QFile>
#include <QFileInfo>
#include <QObject>
+#include <QDir>
+#include <QDebug>
using namespace ProjectExplorer;
@@ -210,6 +212,9 @@ void VcProjectReader::readFile()
{
File *file = new File;
file->relativePath = attrStr(strRelativePath);
+#if !defined(Q_OS_WIN)
+ file->relativePath.replace(QLatin1Char('\\'), QDir::separator());
+#endif
m_currentFilter->files.append(file);
readNextNonSpace();