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

normalize the output of $$find()

Browse Source 
follow suit with qt5 qmake. this is actually wrong for qt4 qmake, but i
boldly assume that it doesn't matter.

Change-Id: I7e0ced1f335fde28f56fa6c5a4a1a581ec7e9ad0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-07-25 19:31:11 +02:00
parent 780c0eac10
commit 397cfb700b
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,22 +340,6 @@ static void replaceInList(ProStringList *varlist,
}
}
// This is braindead, but we want qmake compat
QString QMakeEvaluator::fixPathToLocalOS(const QString &str) const
{
QString string = m_option->expandEnvVars(str);
if (string.length() > 2 && string.at(0).isLetter() && string.at(1) == QLatin1Char(':'))
string[0] = string[0].toLower();
#if defined(Q_OS_WIN32)
string.replace(QLatin1Char('/'), QLatin1Char('\\'));
#else
string.replace(QLatin1Char('\\'), QLatin1Char('/'));
#endif
return string;
}
//////// Evaluator /////////
static ALWAYS_INLINE void addStr(