From 5fbd3e1aacf789cc46fef57d8726333ee8a00e03 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 9 Dec 2011 12:12:28 +0200 Subject: Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS The case of the drive letter generated to the absolute paths seems to have changed between 4.7 and 4.8, which led into regression with projects that utilize $$PWD in target name, as that still returns the path with drive letter in same case as previously. Fixed the critical check to be case insensitive in windows. Task-number: ou1cimx1#951456 Reviewed-by: Murray Read --- qmake/generators/symbian/symmake_sbsv2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index cc32f8d..5077be5 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -650,7 +650,11 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t foreach(QString targetItem, project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_TARGETS.") + item)) { // Make sure targetpath is absolute QString absoluteTarget = QDir::cleanPath(outputDir.absoluteFilePath(targetItem)); +#if defined(Q_OS_WIN) + if (allPreDeps.contains(absoluteTarget, Qt::CaseInsensitive)) { +#else if (allPreDeps.contains(absoluteTarget)) { +#endif QStringList deps = project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + item + targetItem); QString commandItem = project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + item + targetItem).join(" "); -- cgit v0.12