diff options
Diffstat (limited to 'patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch')
| -rw-r--r-- | patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch index f3ab87b..9536127 100644 --- a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch +++ b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch @@ -1,4 +1,4 @@ -From be0dd0f2149064e9655edaa5d7c24bef3e034dd5 Mon Sep 17 00:00:00 2001 +From 0b1ac7cf3b009293c3a7acddc854fa375ab40996 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 15 Nov 2010 13:55:17 -0600 Subject: [PATCH] Make syncqt use sync.profile files from each module @@ -14,7 +14,7 @@ enables it to work for other modules than just qtbase. create mode 100644 qtbase/sync.profile diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index b8162d2..7e5fc44 100755 +index b867106..e3d941b 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -12,40 +12,22 @@ @@ -128,7 +128,7 @@ index b8162d2..7e5fc44 100755 my $parsable = ""; if(open(F, "<$iheader")) { -@@ -546,6 +500,52 @@ sub findFiles { +@@ -548,6 +502,52 @@ sub findFiles { return @files; } @@ -181,7 +181,7 @@ index b8162d2..7e5fc44 100755 # -------------------------------------------------------------------- # "main" function # -------------------------------------------------------------------- -@@ -595,6 +595,15 @@ while ( @ARGV ) { +@@ -597,6 +597,15 @@ while ( @ARGV ) { # skip, it's been dealt with at the top of the file shift @ARGV; next; @@ -197,7 +197,7 @@ index b8162d2..7e5fc44 100755 } #do something -@@ -666,6 +675,13 @@ while ( @ARGV ) { +@@ -668,6 +677,13 @@ while ( @ARGV ) { $out_basedir =~ s=\\=/=g; } } @@ -211,7 +211,7 @@ index b8162d2..7e5fc44 100755 @modules_to_sync = keys(%modules) if($#modules_to_sync == -1); $isunix = checkUnix; #cache checkUnix -@@ -676,11 +692,11 @@ mkpath "$out_basedir/include/Qt", !$quiet; +@@ -678,11 +694,11 @@ mkpath "$out_basedir/include/Qt", !$quiet; my @ignore_headers = (); my $class_lib_map_contents = ""; @@ -228,7 +228,7 @@ index b8162d2..7e5fc44 100755 my %colliding_headers = (); my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir -@@ -706,19 +722,8 @@ foreach my $lib (@modules_to_sync) { +@@ -708,19 +724,8 @@ foreach my $lib (@modules_to_sync) { chomp $line; if($line =~ /^ *QT *\+?= *([^\r\n]*)/) { foreach(split(/ /, $1)) { @@ -251,7 +251,7 @@ index b8162d2..7e5fc44 100755 } } diff --git a/qtbase/configure b/qtbase/configure -index 66464fa..fe9e311 100755 +index f2ee5f4..9a04380 100755 --- a/qtbase/configure +++ b/qtbase/configure @@ -2550,8 +2550,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then @@ -266,7 +266,7 @@ index 66464fa..fe9e311 100755 diff --git a/qtbase/sync.profile b/qtbase/sync.profile new file mode 100644 -index 0000000..7d2e4b1 +index 0000000..7d2e4b1a7 --- /dev/null +++ b/qtbase/sync.profile @@ -0,0 +1,44 @@ @@ -330,5 +330,5 @@ index 46f1a87..2d84ad5 100644 } } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 |