diff options
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/makefile.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d109ae053b..f97e66420d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1449,12 +1449,7 @@ MakefileGenerator::createObjectList(const QStringList &sources) for(QStringList::ConstIterator it = sources.begin(); it != sources.end(); ++it) { QFileInfo fi(fileInfo(Option::fixPathToLocalOS((*it)))); QString dir; - if(objdir.isEmpty() && project->isActiveConfig("object_with_source")) { - QString fName = Option::fixPathToTargetOS((*it), false); - int dl = fName.lastIndexOf(Option::dir_sep); - if(dl != -1) - dir = fName.left(dl + 1); - } else if (project->isActiveConfig("object_parallel_to_source")) { + if (project->isActiveConfig("object_parallel_to_source")) { // The source paths are relative to the output dir, but we need source-relative paths QString sourceRelativePath = fileFixify(*it, qmake_getpwd(), Option::output_dir); sourceRelativePath = Option::fixPathToTargetOS(sourceRelativePath, false); |