summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-01-11 13:09:44 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-01-11 13:11:50 (GMT)
commit22d30bd6c1e8355cb4520885b0d0fef3526cc4e9 (patch)
treed69561cc4d789be5443544f2f181da2680573d32 /bin
parente1e67e84b223b36a01d767c163de730702057eb8 (diff)
downloadQt-22d30bd6c1e8355cb4520885b0d0fef3526cc4e9.zip
Qt-22d30bd6c1e8355cb4520885b0d0fef3526cc4e9.tar.gz
Qt-22d30bd6c1e8355cb4520885b0d0fef3526cc4e9.tar.bz2
[syncqt] Make -separate-module work with WebKit's directory structure
Changed the syntax to allow for the situation where the .pro file is in a different directory than the header files to install. In this case the resulting Makefile is in WebCore/Makefile, so the references in headers.pri to for example qwebview.h has to be ../WebKit/qt/Api/qwebview.h. This doesn't affect any existing syncqt operations inside of Qt. Reviewed-by: Trust me
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 3ac70a4..1fb5304 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -93,7 +93,7 @@ sub showUsage
print " -windows Force platform to Windows (default: " . ($force_win ? "yes" : "no") . ")\n";
print " -showonly Show action but not perform (default: " . ($showonly ? "yes" : "no") . ")\n";
print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n";
- print " -separate-module <NAME>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> \n";
+ print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n";
print " -help This help\n";
exit 0;
}
@@ -646,10 +646,10 @@ while ( @ARGV ) {
die "No such module: $val" unless(defined $modules{$val});
push @modules_to_sync, $val;
} elsif ("$var" eq "separate-module") {
- my ($module, $srcdir) = split(/:/, $val);
- $modules{$module} = $srcdir;
+ my ($module, $prodir, $headerdir) = split(/:/, $val);
+ $modules{$module} = $prodir;
push @modules_to_sync, $module;
- delete $moduleheaders{$module} if ($moduleheaders{$module});
+ $moduleheaders{$module} = $headerdir;
$create_uic_class_map = 0;
$create_private_headers = 0;
} elsif ("$var" eq "output") {