Removed all the 4.7 patches and made master patches the default.

1 files changed, 22 insertions, 22 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 d105e91..6f19175 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,4 +1,4 @@
-From e2a8fde6428f6f1cafe5cd3509f3b723fee468b0 Mon Sep 17 00:00:00 2001
+From 57a3cc555e65d07507375d9ffa0a796b38f8063a 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
@@ -53,12 +53,12 @@ for syncqt to create the fwding pris in QtKernel.
  create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri
 
 diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt
-index e9bb124..fa0fbd3 100755
+index 7e5fc44..bceab27 100755
 --- a/qtkernel/bin/syncqt
 +++ b/qtkernel/bin/syncqt
-@@ -21,8 +21,16 @@ our $out_basedir = getcwd();
- $out_basedir =~ s=\\=/=g;
- our $basedir;
+@@ -23,8 +23,16 @@ our $basedir;
+ our $quoted_basedir;
+ 
  
 +# try to figure out where QtKernel is located
 +# normally the script location should be enough, if not fall back to
@@ -74,7 +74,7 @@ index e9bb124..fa0fbd3 100755
  
  # global variables (modified by options)
  my $isunix = 0;
-@@ -36,6 +44,7 @@ my $check_includes = 0;
+@@ -38,6 +46,7 @@ my $check_includes = 0;
  my $copy_headers = 0;
  my $create_uic_class_map = 1;
  my $create_private_headers = 1;
@@ -82,7 +82,7 @@ index e9bb124..fa0fbd3 100755
  my @modules_to_sync ;
  $force_relative = 1 if ( -d "/System/Library/Frameworks" );
  
-@@ -60,9 +69,12 @@ sub showUsage
+@@ -62,9 +71,12 @@ 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";
@@ -179,25 +179,25 @@ index e9bb124..fa0fbd3 100755
  }
  unless($showonly || !$create_uic_class_map) {
 diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf
-index 19e01a1..0da44e9 100644
+index de1cac4..2973c7e 100644
 --- a/qtkernel/mkspecs/features/qt_config.prf
 +++ b/qtkernel/mkspecs/features/qt_config.prf
-@@ -11,7 +11,14 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
-    debug(1, "Cannot load qconfig.pri!")
- } else {
-    debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
--   for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod)
-+   for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))) {
-+      # For installed Qt these paths will be common for all modules
-+      # For development these will vary per module, and syncqt will override the value in the
-+      # qt_<module>.pri forwarding file
-+      QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
-+      QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS]
-+      include($$mod)
-+   }
+@@ -14,7 +14,14 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
+    for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \
+                                    $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) {
+       debug(1, "Loading modules from $${dir}")
+-      for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod)
++      for(mod, $$list($$files($$dir/modules/qt_*.pri))) {
++         # For installed Qt these paths will be common for all modules
++         # For development these will vary per module, and syncqt will override the value in the
++         # qt_<module>.pri forwarding file
++         QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
++         QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS]
++         include($$mod)
++      }
+    }
  }
  
- load(qt_functions)
 diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri
 new file mode 100644
 index 0000000..742aefe