From b6829fedc76defad2cc8ce9fdca680f9d1bf10f5 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 11 Mar 2011 17:08:39 +0100
Subject: [PATCH] DebuggingHelpers: Properly escape paths with spaces in it
This is important especially on the Mac , where the default QtCreator
directory contains a PATH in it.
---
src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
index 727abce72b6..cd07bd4ae3a 100644
--- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
+++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
@@ -185,8 +185,8 @@ bool DebuggingHelperBuildTask::buildDebuggingHelper(QFutureInterface<void> &futu
return false;
QStringList qmakeArgs;
- qmakeArgs << QLatin1String("INCLUDEPATH+=") + qmlDebuggingDirectory + "/include";
- qmakeArgs << QLatin1String("LIBS+=-L") + qmlDebuggingDirectory;
+ qmakeArgs << QLatin1String("INCLUDEPATH+=\"\\\"") + qmlDebuggingDirectory + "include\\\"\"";
+ qmakeArgs << QLatin1String("LIBS+=-L\"\\\"") + qmlDebuggingDirectory + QLatin1String("\\\"\"");
if (!QmlObserverTool::build(qmlObserverDirectory, m_makeCommand, m_qmakeCommand, m_mkspec,
m_environment, m_target, qmakeArgs, output, &m_errorMessage))
--
GitLab