Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (31 commits)
  SSL: give protocol enum SecureProtocols an own value
  QMAKE: Fix post build events for VS2010
  SSL backend: avoid setting SNI hostname for old SSL versions
  SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)
  SSL: introduce new option TlsV1SslV3 for SSL communication
  Mac Style: Compile Fix
  Mac: Center the Window title on Cocoa.
  Fix corner of scroll area so it is stylable on Mac.
  QNAM HTTP: Pair channels with requests at a later state.
  tst_qnetworkreply: fix MiniHttpServer crash
  Windows: Activate the context menu on tray icons when shown.
  SSL backend: check at runtime for the right OpenSSL version for SNI
  QNAM HTTP: Fix the ioPostToHttpFromSocket auto test
  Disable capabilities example for symbian-gcce due to a bug in elf2e32
  Fixed documentation for QByteArray
  Improve handling QByteArray with QStringBuilder
  Do not handle posted events in QSplashScreen.
  SSL tests: Be more verbose in on-demand cert test
  Fix qstringbuilder test.
  Wrap qPrintable inside QString
  ...

1 files changed, 8 insertions, 3 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index f243e86..80f5bde 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1043,22 +1043,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;
     }
 }
 
@@ -1189,6 +1193,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;
     }
 }