diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-08-31 19:00:30 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-02 10:09:46 +0000 |
| commit | 25d534efda27c60d660e4b6617328f318c7863d6 (patch) | |
| tree | a1fa1a9483b63eef64f067b10a6a21702996ce68 | |
| parent | f9f214925141c404727ca49d5cc164d3a72ac3df (diff) | |
| download | qt-creator-25d534efda27c60d660e4b6617328f318c7863d6.tar.gz | |
QMakeProjectManager: Update for change in QDir::relativeFilePath()
Change-Id: I8526df516a514678f30583956a00fdd5a2e770c5
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/makestep.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index b6991cf1bf..d401967922 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 + |