From 6bb69b9b0e12fc83aa2acccd5cce1db4757d8aea Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 13 Nov 2014 11:28:08 +0100 Subject: don't resolve DESTDIR against source dir in RES_FILE construction that makes no sense at all. and OBJECTS_DIR is not resolved, either. Change-Id: Ie76b9de6bb11ae42945255f2e168943066d2f60d Reviewed-by: Joerg Bornemann --- qmake/generators/win32/winmakefile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 0d36436b7e..0255145b96 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -518,7 +518,7 @@ void Win32MakefileGenerator::processRcFileVar() if (!project->values("OBJECTS_DIR").isEmpty()) { QString resDestDir; if (project->isActiveConfig("staticlib")) - resDestDir = fileInfo(project->first("DESTDIR").toQString()).absoluteFilePath(); + resDestDir = project->first("DESTDIR").toQString(); else resDestDir = project->first("OBJECTS_DIR").toQString(); resDestDir.append(Option::dir_sep); -- cgit v1.2.3