diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-10-05 17:12:02 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-10-05 18:58:38 (GMT) |
commit | 474295602d473078aebff00a8d2e8265cdc5d424 (patch) | |
tree | 530dca425440fe9ea6198868f86611d8652a58eb /qmake | |
parent | 07256884f745e93d98687b213d037baf4be538a1 (diff) | |
download | Qt-474295602d473078aebff00a8d2e8265cdc5d424.zip Qt-474295602d473078aebff00a8d2e8265cdc5d424.tar.gz Qt-474295602d473078aebff00a8d2e8265cdc5d424.tar.bz2 |
make QMAKE_POST_LINK handling in nmake generator sane
there is no point in &&-ing it with a possibly present signature command
- putting it on a line of its own works just fine - with the added
benefit of not breaking if it contains operators itself.
Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 92e8aeb..907f8dc 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -310,10 +310,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) t << "\n\tsigntool sign /F " << signature << " $(DESTDIR_TARGET)"; } if(!project->isEmpty("QMAKE_POST_LINK")) { - if (useSignature) - t << " && " << var("QMAKE_POST_LINK"); - else - t << "\n\t" << var("QMAKE_POST_LINK"); + t << "\n\t" << var("QMAKE_POST_LINK"); } t << endl; } |