diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-02-28 17:35:49 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-02 10:33:32 (GMT) |
| commit | d897aa842d6f05a0bad60b55d999e7bd4ebc1a04 (patch) | |
| tree | 907d1bf60f7f6b9200197e1d47c7a3df084e8587 /qmake/generators | |
| parent | 332988a37962224619748434f9dc426e3cf88a6d (diff) | |
| download | Qt-d897aa842d6f05a0bad60b55d999e7bd4ebc1a04.zip Qt-d897aa842d6f05a0bad60b55d999e7bd4ebc1a04.tar.gz Qt-d897aa842d6f05a0bad60b55d999e7bd4ebc1a04.tar.bz2 | |
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
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 4 |
1 files 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); |