diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-08 15:43:32 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 19:25:32 (GMT) |
| commit | 811f22d44edc4e57236afef0803ff18504bfedf6 (patch) | |
| tree | 3584cf37d8649cdc75133f917868c74f69363490 /tools/linguist | |
| parent | 31c6cbbe529c6fdbaf259f7ed87547db6dda7842 (diff) | |
| download | Qt-811f22d44edc4e57236afef0803ff18504bfedf6.zip Qt-811f22d44edc4e57236afef0803ff18504bfedf6.tar.gz Qt-811f22d44edc4e57236afef0803ff18504bfedf6.tar.bz2 | |
correctly resolve INCLUDEPATH relative to current project
Task-number: QTBUG-24587
Change-Id: I1384403e5c5e3313649fa4abb98e7578cae4677b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qttools/92020773c1739feb4dc240827271720f615431d0)
Diffstat (limited to 'tools/linguist')
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 341397b..bf0b328 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -371,7 +371,7 @@ static void processProject( ConversionData cd; cd.m_noUiLines = options & NoUiLines; cd.m_codecForSource = codecForSource; - cd.m_includePath = visitor.values(QLatin1String("INCLUDEPATH")); + cd.m_includePath = visitor.absolutePathValues(QLatin1String("INCLUDEPATH"), pfi.absolutePath()); QStringList sourceFiles = getSources(visitor, pfi.absolutePath()); QSet<QString> sourceDirs; sourceDirs.insert(QDir::cleanPath(pfi.absolutePath()) + QLatin1Char('/')); |