diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-13 11:28:08 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-05 14:26:49 +0000 |
| commit | 6bb69b9b0e12fc83aa2acccd5cce1db4757d8aea (patch) | |
| tree | 40d936e7dc358ef4ad403cb7566f991306b9002c | |
| parent | ea4a84074ef5ae6bd6b8deea170c777b3f5695e5 (diff) | |
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 <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |