diff options
author | Martin Petersson <martin.petersson@nokia.com> | 2011-03-15 08:40:36 (GMT) |
---|---|---|
committer | Martin Petersson <martin.petersson@nokia.com> | 2011-03-15 08:49:26 (GMT) |
commit | c600cbac60c0453815ee2721e0748a991343b5b2 (patch) | |
tree | d56cc594d9a8c957e29a9e44f5012397dbf8f707 /qmake | |
parent | 1992cdb292d1961d6b210a3c1d2532556d2c9195 (diff) | |
download | Qt-c600cbac60c0453815ee2721e0748a991343b5b2.zip Qt-c600cbac60c0453815ee2721e0748a991343b5b2.tar.gz Qt-c600cbac60c0453815ee2721e0748a991343b5b2.tar.bz2 |
QMAKE: Fix post build events for VS2010
We have changed 'Use in build' for VS2010 to now use "Excluded From
Build" to have the same as in VS2008. This will enable post build
event again for VS2010.
Reviewed-by: Joerg Bornemann
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 0df33d0..8455189 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1072,22 +1072,26 @@ void VcprojGenerator::initPreBuildEventTools() void VcprojGenerator::initPostBuildEventTools() { VCConfiguration &conf = vcProject.Configuration; - if(!project->values("QMAKE_POST_LINK").isEmpty()) { + if (!project->values("QMAKE_POST_LINK").isEmpty()) { QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK")); conf.postBuild.CommandLine = cmdline; conf.postBuild.Description = cmdline.join(QLatin1String("\r\n")); + conf.postBuild.ExcludedFromBuild = _False; } QString signature = !project->isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE"); bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") && !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH"); - if(useSignature) + if (useSignature) { conf.postBuild.CommandLine.prepend( QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\"")); + conf.postBuild.ExcludedFromBuild = _False; + } - if(!project->values("MSVCPROJ_COPY_DLL").isEmpty()) { + if (!project->values("MSVCPROJ_COPY_DLL").isEmpty()) { conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC"); conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL"); + conf.postBuild.ExcludedFromBuild = _False; } } @@ -1218,6 +1222,7 @@ void VcprojGenerator::initPreLinkEventTools() QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK")); conf.preLink.CommandLine = cmdline; conf.preLink.Description = cmdline.join(QLatin1String("\r\n")); + conf.preLink.ExcludedFromBuild = _False; } } |