Merge remote branch 'origin/4.7' into qt-master-from-4.7

2 files changed, 3 insertions, 4 deletions

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 7453ba5..939c38e 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -181,7 +181,7 @@ if ($signed_sis_name eq "") {
 }
 
 my $unsigned_sis_name = $sisoutputbasename."_unsigned.sis";
-my $stub_sis_name = $sisoutputbasename."_stub.sis";
+my $stub_sis_name = $sisoutputbasename.".sis";
 
 # Store some utility variables
 my $scriptpath = dirname(__FILE__);
@@ -292,7 +292,7 @@ if($stub) {
     # Create stub SIS.
     system ("makesis -s $pkgoutput $stub_sis_name");
 } else {
-    if ($certtext eq "Self Signed" && !@certificates) {
+    if ($certtext eq "Self Signed" && !@certificates && $templatepkg !~ m/_installer\.pkg$/i) {
         print("Auto-patching capabilities for self signed package.\n");
         system ("patch_capabilities $pkgoutput");
     }
diff --git a/bin/syncqt b/bin/syncqt
index 71b71db..252aefa 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -50,8 +50,7 @@ my %modules = ( # path to module name map
         "QtDBus" => "$basedir/src/dbus",
         "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore",
         "phonon" => "$basedir/src/phonon",
-        "QtMultimedia" => "$basedir/src/multimedia/multimedia",
-        "QtMediaServices" => "$basedir/src/multimedia/mediaservices",
+        "QtMultimedia" => "$basedir/src/multimedia",
 );
 my %moduleheaders = ( # restrict the module headers to those found in relative path
         "QtWebKit" => "../WebKit/qt/Api",