summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-04-14 11:51:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-16 07:28:52 +0200
commitc99f909bedad3f590c92deeeefa02e4e74029c1c (patch)
tree7bda3c8117f944916f9907f9326633bf7d122868 /qmake
parenta08b5201c15a2fb13afd2cb28fe138e3e3439051 (diff)
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 <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/option.cpp2
1 files changed, 1 insertions, 1 deletions
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('/');