diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-07 20:41:20 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-15 19:23:13 +0100 |
| commit | 871c714903bdef597ae2d54991eabdc8024d9fba (patch) | |
| tree | 817800d62ffc9342ccd34cc72fdc0bf04dd1c724 /src/shared | |
| parent | c3b083b521b8eabb7b3c9849711f889e270a1304 (diff) | |
| download | qt-creator-871c714903bdef597ae2d54991eabdc8024d9fba.tar.gz | |
clean superfile and cachefile paths upon creation
otherwise, if the output dir is the root, the path would be denormalized.
the code for finding existing files already does that.
Change-Id: I56d70477e9c9ffcd936325068624a84df10ffd87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/72075656cfeac570ce002c517a22b1c5d7bc0dd0)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 36515f1132..6f9cd2a462 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -1712,14 +1712,14 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( QString fn; if (super) { if (m_superfile.isEmpty()) { - m_superfile = m_outputDir + QLatin1String("/.qmake.super"); + m_superfile = QDir::cleanPath(m_outputDir + QLatin1String("/.qmake.super")); printf("Info: creating super cache file %s\n", qPrintable(m_superfile)); valuesRef(ProKey("_QMAKE_SUPER_CACHE_")) << ProString(m_superfile); } fn = m_superfile; } else { if (m_cachefile.isEmpty()) { - m_cachefile = m_outputDir + QLatin1String("/.qmake.cache"); + m_cachefile = QDir::cleanPath(m_outputDir + QLatin1String("/.qmake.cache")); printf("Info: creating cache file %s\n", qPrintable(m_cachefile)); valuesRef(ProKey("_QMAKE_CACHE_")) << ProString(m_cachefile); // We could update m_{source,build}Root and m_featureRoots here, or even |