AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't make relative paths if we don't know the top-level build dir

Browse Source 
regression from qt4.

Task-number: QTBUG-37113
Change-Id: I34813f03d8ec686e3ecb49f66629079489a3d83d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-04-14 11:51:02 +02:00 committed by The Qt Project
parent a08b5201c1
commit c99f909bed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/option.cpp
View File

@ -488,7 +488,7 @@ bool Option::postProcessProject(QMakeProject *project)
Option::dir_sep = project->dirSep().toQString(); Option::dir_sep = project->dirSep().toQString();
if (Option::output_dir.startsWith(project->buildRoot())) if (!project->buildRoot().isEmpty() && Option::output_dir.startsWith(project->buildRoot()))
Option::mkfile::cachefile_depth = Option::mkfile::cachefile_depth =
Option::output_dir.mid(project->buildRoot().length()).count('/'); Option::output_dir.mid(project->buildRoot().length()).count('/');