From 25d534efda27c60d660e4b6617328f318c7863d6 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@theqtcompany.com>
Date: Mon, 31 Aug 2015 19:00:30 +0200
Subject: [PATCH] QMakeProjectManager: Update for change in
 QDir::relativeFilePath()

Change-Id: I8526df516a514678f30583956a00fdd5a2e770c5
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
---
 src/plugins/qmakeprojectmanager/makestep.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp
index b6991cf1bf3..d401967922b 100644
--- a/src/plugins/qmakeprojectmanager/makestep.cpp
+++ b/src/plugins/qmakeprojectmanager/makestep.cpp
@@ -232,6 +232,8 @@ bool MakeStep::init()
             }
         }
         QString relObjectsDir = QDir(pp->workingDirectory()).relativeFilePath(objectsDir);
+        if (relObjectsDir == QLatin1String("."))
+            relObjectsDir.clear();
         if (!relObjectsDir.isEmpty())
             relObjectsDir += QLatin1Char('/');
         QString objectFile = relObjectsDir +