From a72420d012fd09f0a79ae75b77eb1c3bbff75669 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 16 Aug 2012 13:02:30 +0200 Subject: qmake: object_with_source feature removed By putting object_with_source into CONFIG one could force qmake to output each object file into the same directory as its source file came from. This was a rather nasty work-around from Qt 3 times to support source files with the same file name in a project. Unfortunately this doesn't play nicely with shadow builds. Change-Id: Ie79e14d36ba6eac4219edc14ea75ab6a96f9ea96 Reviewed-by: Oswald Buddenhagen --- qmake/generators/makefile.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'qmake') 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); -- cgit v1.2.3