From c99f909bedad3f590c92deeeefa02e4e74029c1c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 14 Apr 2014 11:51:02 +0200 Subject: [PATCH] don't make relative paths if we don't know the top-level build dir regression from qt4. Task-number: QTBUG-37113 Change-Id: I34813f03d8ec686e3ecb49f66629079489a3d83d Reviewed-by: Eskil Abrahamsen Blomfeldt --- qmake/option.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/option.cpp b/qmake/option.cpp index a2bd938666..677899950c 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -488,7 +488,7 @@ bool Option::postProcessProject(QMakeProject *project) 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::output_dir.mid(project->buildRoot().length()).count('/');