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

make $$shell_{path,quote}() use correct path separator

Browse Source 
follow suit with qmake ...

Change-Id: I0221f6c81bc770c37f501d79c31860549c0c0076
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-21 17:28:52 +02:00
parent 2db6609556
commit c5e87aa0c1
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -1009,7 +1009,7 @@ ProStringList QMakeEvaluator::evaluateExpandFunction(
evalError(fL1S("shell_path(path) requires one argument.")); evalError(fL1S("shell_path(path) requires one argument."));
} else { } else {
QString rstr = args.at(0).toQString(m_tmp1); QString rstr = args.at(0).toQString(m_tmp1);
if (m_option->dir_sep.at(0) != QLatin1Char('/')) if (m_dirSep.startsWith(QLatin1Char('\\')))
rstr.replace(QLatin1Char('/'), QLatin1Char('\\')); rstr.replace(QLatin1Char('/'), QLatin1Char('\\'));
else else
rstr.replace(QLatin1Char('\\'), QLatin1Char('/')); rstr.replace(QLatin1Char('\\'), QLatin1Char('/'));
@@ -1029,7 +1029,7 @@ ProStringList QMakeEvaluator::evaluateExpandFunction(
evalError(fL1S("shell_quote(arg) requires one argument.")); evalError(fL1S("shell_quote(arg) requires one argument."));
} else { } else {
QString rstr = args.at(0).toQString(m_tmp1); QString rstr = args.at(0).toQString(m_tmp1);
if (m_option->dir_sep.at(0) != QLatin1Char('/')) if (m_dirSep.startsWith(QLatin1Char('\\')))
rstr = IoUtils::shellQuoteWin(rstr); rstr = IoUtils::shellQuoteWin(rstr);
else else
rstr = IoUtils::shellQuoteUnix(rstr); rstr = IoUtils::shellQuoteUnix(rstr);

3
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -201,6 +201,7 @@ void QMakeEvaluator::initFrom(const QMakeEvaluator &other)
m_qmakespecName = other.m_qmakespecName; m_qmakespecName = other.m_qmakespecName;
m_mkspecPaths = other.m_mkspecPaths; m_mkspecPaths = other.m_mkspecPaths;
m_featureRoots = other.m_featureRoots; m_featureRoots = other.m_featureRoots;
m_dirSep = other.m_dirSep;
} }
//////// Evaluator tools ///////// //////// Evaluator tools /////////
@@ -1105,6 +1106,8 @@ bool QMakeEvaluator::loadSpec()
if (!evaluateFeatureFile(QLatin1String("spec_post.prf"))) if (!evaluateFeatureFile(QLatin1String("spec_post.prf")))
return false; return false;
updateFeaturePaths(); // The spec extends the feature search path, so rebuild the cache. updateFeaturePaths(); // The spec extends the feature search path, so rebuild the cache.
// The MinGW and x-build specs may change the separator; $$shell_{path,quote}() need it
m_dirSep = first(ProKey("QMAKE_DIR_SEP"));
if (!m_conffile.isEmpty() if (!m_conffile.isEmpty()
&& !evaluateFileDirect(m_conffile, QMakeHandler::EvalConfigFile, LoadProOnly)) { && !evaluateFileDirect(m_conffile, QMakeHandler::EvalConfigFile, LoadProOnly)) {
return false; return false;

1
src/shared/proparser/qmakeevaluator.h
View File

@@ -233,6 +233,7 @@ public:
QStringList m_qmakefeatures; QStringList m_qmakefeatures;
QStringList m_mkspecPaths; QStringList m_mkspecPaths;
QStringList m_featureRoots; QStringList m_featureRoots;
ProString m_dirSep;
ProFunctionDefs m_functionDefs; ProFunctionDefs m_functionDefs;
ProStringList m_returnValue; ProStringList m_returnValue;
QStack<ProValueMap> m_valuemapStack; // VariableName must be us-ascii, the content however can be non-us-ascii. QStack<ProValueMap> m_valuemapStack; // VariableName must be us-ascii, the content however can be non-us-ascii.