feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMakeProjectManager: Update for change in QDir::relativeFilePath()

Browse Source 
Change-Id: I8526df516a514678f30583956a00fdd5a2e770c5
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-08-31 19:00:30 +02:00
parent f9f2149251
commit 25d534efda
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/makestep.cpp
View File

@@ -232,6 +232,8 @@ bool MakeStep::init()
} }
} }
QString relObjectsDir = QDir(pp->workingDirectory()).relativeFilePath(objectsDir); QString relObjectsDir = QDir(pp->workingDirectory()).relativeFilePath(objectsDir);
if (relObjectsDir == QLatin1String("."))
relObjectsDir.clear();
if (!relObjectsDir.isEmpty()) if (!relObjectsDir.isEmpty())
relObjectsDir += QLatin1Char('/'); relObjectsDir += QLatin1Char('/');
QString objectFile = relObjectsDir + QString objectFile = relObjectsDir +