aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakemakestep.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/qmakemakestep.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index 79048cc9ab2..c6c2e6a6dee 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -140,6 +140,16 @@ bool QmakeMakeStep::init()
objectsDir += "/release";
}
}
+
+ if (subProFile->isObjectParallelToSource()) {
+ const Utils::FilePath sourceFileDir = bc->fileNodeBuild()->filePath().parentDir();
+ const Utils::FilePath proFileDir = subProFile->proFile()->sourceDir().canonicalPath();
+ if (!objectsDir.endsWith('/'))
+ objectsDir += QLatin1Char('/');
+ objectsDir += sourceFileDir.relativeChildPath(proFileDir).toString();
+ objectsDir = QDir::cleanPath(objectsDir);
+ }
+
QString relObjectsDir = QDir(pp->workingDirectory().toString())
.relativeFilePath(objectsDir);
if (relObjectsDir == ".")