diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-25 20:08:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-21 14:43:16 +0200 |
| commit | 9d8be960ab3feee8653e9c586dc92a353338a4fe (patch) | |
| tree | ef1bc366d99e7b7b73b47380d4b5bdf29f7117da | |
| parent | 3b8ea78570edcf81820f0e5e053337ecb42bf086 (diff) | |
| download | qttools-9d8be960ab3feee8653e9c586dc92a353338a4fe.tar.gz | |
clean paths of found files in prepareProject()
any of the directories may be the root, which would lead to double slashes
in the constructed filenames.
Change-Id: I053e167a19b795b40e780fc29db356c7f24d286a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/97be79012cd39d1d0e7748d5c500d86c3becc258)
| -rw-r--r-- | src/linguist/shared/qmakeevaluator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index ef86f003f..404974cc6 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -1062,7 +1062,7 @@ bool QMakeEvaluator::prepareProject(const QString &inDir) forever { QString superfile = superdir + QLatin1String("/.qmake.super"); if (IoUtils::exists(superfile)) { - m_superfile = superfile; + m_superfile = QDir::cleanPath(superfile); break; } QFileInfo qdfi(superdir); @@ -1099,8 +1099,8 @@ bool QMakeEvaluator::prepareProject(const QString &inDir) } else { m_buildRoot = QFileInfo(cachefile).path(); } - m_conffile = conffile; - m_cachefile = cachefile; + m_conffile = QDir::cleanPath(conffile); + m_cachefile = QDir::cleanPath(cachefile); } no_cache: |