From fd9681916199f621c22b0b8a526ac9d301f9ceb1 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 7 Oct 2010 11:14:20 +0200
Subject: [PATCH] Qt4: Use native pathes in qmake arguments
Use native pathes in qmake arguments.
---
src/plugins/qt4projectmanager/qmakestep.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 6e7003cccf5..fe858f5a7b5 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -106,9 +106,9 @@ QStringList QMakeStep::allArguments()
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
QStringList arguments;
if (bc->subNodeBuild())
- arguments << bc->subNodeBuild()->path();
+ arguments << QDir::toNativeSeparators(bc->subNodeBuild()->path());
else
- arguments << buildConfiguration()->target()->project()->file()->fileName();
+ arguments << QDir::toNativeSeparators(buildConfiguration()->target()->project()->file()->fileName());
arguments << "-r";
if (!additonalArguments.contains("-spec"))
@@ -153,6 +153,7 @@ QStringList QMakeStep::moreArguments()
<< QLatin1String("RCC_DIR=rcc");
}
+ // Do not turn debugger path into native path separators: Qmake does not like that!
arguments << QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH) + QLatin1Char('=') +
Core::ICore::instance()->resourcePath() + QLatin1String("/qml/qmljsdebugger");
return arguments;
--
GitLab