From d897aa842d6f05a0bad60b55d999e7bd4ebc1a04 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 28 Feb 2011 18:35:49 +0100 Subject: fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is used don't insert an empty line between the command sets. this is needed for building sdk packages with breakpad support (which we want to do), so i'm defining it to be P1. Reviewed-by: mariusSO --- qmake/generators/win32/winmakefile.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index d92eb69..44e5164 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -662,10 +662,10 @@ void Win32MakefileGenerator::writeStandardParts(QTextStream &t) if(project->isActiveConfig("shared") && !project->values("DLLDESTDIR").isEmpty()) { QStringList dlldirs = project->values("DLLDESTDIR"); for (QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir) { - t << "\n\t" << "-$(COPY_FILE) \"$(DESTDIR_TARGET)\" " << Option::fixPathToTargetOS(*dlldir, false); + t << "\t" << "-$(COPY_FILE) \"$(DESTDIR_TARGET)\" " << Option::fixPathToTargetOS(*dlldir, false) << endl; } } - t << endl << endl; + t << endl; writeRcFilePart(t); -- cgit v0.12