Fixes for the second final push (the first one failed).HEADmaster

1 files changed, 11 insertions, 12 deletions

diff --git a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch
index 0973845..5674aad 100644
--- a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch
+++ b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch
@@ -1,8 +1,7 @@
-From bc218a6908c168da3ec38eeec557b2f81aea7b97 Mon Sep 17 00:00:00 2001
+From 75ed9b9b4480ad3065728b2e9d6cec4be79a7eab Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Wed, 24 Nov 2010 20:21:06 -0600
-Subject: [PATCH] Add module specific pris, and make syncqt create fwd
- includes
+Subject: [PATCH] Add module specific pris, and make syncqt create fwd includes
 
 The module specific pris define the modules
     name
@@ -54,7 +53,7 @@ for syncqt to create the fwding pris in QtBase.
  create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri
 
 diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt
-index 7e5fc44..37e408c 100755
+index e3d941b..ac540ea 100755
 --- a/qtbase/bin/syncqt
 +++ b/qtbase/bin/syncqt
 @@ -23,8 +23,16 @@ our $basedir;
@@ -97,7 +96,7 @@ index 7e5fc44..37e408c 100755
      print "  -help                 This help\n";
      exit 0;
  }
-@@ -556,7 +568,7 @@ while ( @ARGV ) {
+@@ -558,7 +570,7 @@ while ( @ARGV ) {
  
      #parse
      my $arg = shift @ARGV;
@@ -106,7 +105,7 @@ index 7e5fc44..37e408c 100755
          $var = "show_help";
          $val = "yes";
      } elsif($arg eq "-copy") {
-@@ -591,10 +603,16 @@ while ( @ARGV ) {
+@@ -593,10 +605,16 @@ while ( @ARGV ) {
      } elsif($arg eq "-private") {
          $var = "create_private_headers";
          $val = "yes";
@@ -123,7 +122,7 @@ index 7e5fc44..37e408c 100755
      } elsif($arg =~/^-/) {
          print "Unknown option: $arg\n\n" if(!$var);
          showUsage();
-@@ -662,6 +680,15 @@ while ( @ARGV ) {
+@@ -664,6 +682,15 @@ while ( @ARGV ) {
          push @modules_to_sync, $module;
          $moduleheaders{$module} = $headerdir;
          $create_uic_class_map = 0;
@@ -139,7 +138,7 @@ index 7e5fc44..37e408c 100755
      } elsif ($var eq "output") {
          my $outdir = $val;
          if(checkRelative($outdir)) {
-@@ -676,6 +703,15 @@ while ( @ARGV ) {
+@@ -678,6 +705,15 @@ while ( @ARGV ) {
      }
  }
  
@@ -155,7 +154,7 @@ index 7e5fc44..37e408c 100755
  # if we have no $basedir we cannot be sure which sources you want, so die
  die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir);
  
-@@ -960,6 +996,23 @@ foreach my $lib (@modules_to_sync) {
+@@ -962,6 +998,23 @@ foreach my $lib (@modules_to_sync) {
              print HEADERS_PRI_FILE $headers_pri_contents;
              close HEADERS_PRI_FILE;
          }
@@ -358,7 +357,7 @@ index 0000000..0f65438
 +QT_CONFIG += testlib
 diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri
 new file mode 100644
-index 0000000..45dbc667
+index 0000000..45dbc66
 --- /dev/null
 +++ b/qtbase/src/modules/qt_xml.pri
 @@ -0,0 +1,11 @@
@@ -374,7 +373,7 @@ index 0000000..45dbc667
 +
 +QT_CONFIG += xml
 diff --git a/qtbase/sync.profile b/qtbase/sync.profile
-index 7d2e4b1..c8ef4fc 100644
+index 7d2e4b1a7..c8ef4fc 100644
 --- a/qtbase/sync.profile
 +++ b/qtbase/sync.profile
 @@ -37,6 +37,19 @@
@@ -426,5 +425,5 @@ index 6707cea..9548e0f 100644
 +    "QtXmlPatterns" => "$basedir/modules/qt_xmlpatterns.pri",
 +);
 -- 
-1.7.5.rc2.4.g4d8b3
+1.7.3.4