diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-12-09 10:12:28 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-12-09 10:28:44 (GMT) |
| commit | 5fbd3e1aacf789cc46fef57d8726333ee8a00e03 (patch) | |
| tree | d59d1d6a34dd0995e39fba0f3f789ab1cc3efd6f /qmake | |
| parent | 21eca49954afb0d98d616d475c1c09ca00606af8 (diff) | |
| download | Qt-5fbd3e1aacf789cc46fef57d8726333ee8a00e03.zip Qt-5fbd3e1aacf789cc46fef57d8726333ee8a00e03.tar.gz Qt-5fbd3e1aacf789cc46fef57d8726333ee8a00e03.tar.bz2 | |
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
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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(" "); |