From 22d30bd6c1e8355cb4520885b0d0fef3526cc4e9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 11 Jan 2010 14:09:44 +0100 Subject: [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 --- bin/syncqt | 8 ++++---- 1 file 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 Specify output directory for sync (default: $out_basedir)\n"; - print " -separate-module : Create headers for with original headers in \n"; + print " -separate-module :: Create headers for with original headers in relative to \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") { -- cgit v0.12