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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix bug in QML debug client installation
  Doc clarification for Loader.
  Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget
  Create dummy window surface if if _q_DummyWindowSurface property is set
  Remove widget subtree from backing store tracker when reparented
  Suppress call to controlVisibilityChanged for null control pointer
  Set the location of the closing brace.
  Fix patch_capabilities.pl script for explicit set of capabilities
  Fix empty mifconv TARGETFILE in some edge cases.

1 files changed, 3 insertions, 0 deletions

diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 06ab116..5230480 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -269,6 +269,9 @@ if (@ARGV)
             if (@capabilitiesSpecified)
             {
                 $commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesSpecified));
+                $executeNeeded = 1;
+                my $capString = join(" ", @capabilitiesSpecified);
+                print ("Patching: Patching the the Vendor ID to 0 and the capabilities used to: \"$capString\" in \"$binaryBaseName\".\n");
             } else {
                 # Test which capabilities are present and then restrict them to the allowed set.
                 # This avoid raising the capabilities of apps that already have none.