summaryrefslogtreecommitdiffstats
path: root/bin/createpackage.pl
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-27 07:32:36 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-27 07:32:36 (GMT)
commit1a62f2ae0624293341bef3fad88c5926cb5b3037 (patch)
treeeb690ecd4ca89d818ee62f7c05775ff766fe1314 /bin/createpackage.pl
parent29a6377c6539840ca901bdcb045a42b7832ac98a (diff)
parent8f21474fb8b8d51d00d71f566e1b291b926b42bd (diff)
downloadQt-1a62f2ae0624293341bef3fad88c5926cb5b3037.zip
Qt-1a62f2ae0624293341bef3fad88c5926cb5b3037.tar.gz
Qt-1a62f2ae0624293341bef3fad88c5926cb5b3037.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
Diffstat (limited to 'bin/createpackage.pl')
-rwxr-xr-xbin/createpackage.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 8b787cb..984c1fd 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -300,7 +300,8 @@ if($stub) {
&& $templatepkg !~ m/_installer\.pkg$/i
&& !$onlyUnsigned) {
print("Auto-patching capabilities for self signed package.\n");
- system ("patch_capabilities $pkgoutput");
+ my $patch_capabilities = File::Spec->catfile(dirname($0), "patch_capabilities");
+ system ("$patch_capabilities $pkgoutput");
}
# Create SIS.