Replace qtkernel with qtbase

1 files changed, 69 insertions, 69 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 6f19175..2816062 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
@@ -11,7 +11,7 @@ The module specific pris define the modules
     lib paths
     additional CONFIGs and DEFINES
 They are located in the modules source directory, with fwd
-includes created in QtKernel/mkspecs/modules build directory.
+includes created in QtBase/mkspecs/modules build directory.
 The pris use
     QT_MODULE_INCLUDE_BASE
     QT_MODULE_LIB_BASE
@@ -22,51 +22,51 @@ are normally based on
 for installed modules, but overridden to the module's build
 directory by syncqt for the fwd included pris.
 The path of the pris must be specified in the sync.profile
-for syncqt to create the fwding pris in QtKernel.
+for syncqt to create the fwding pris in QtBase.
 ---
- qtkernel/bin/syncqt                      |   59 ++++++++++++++++++++++++++++--
- qtkernel/mkspecs/features/qt_config.prf  |    9 ++++-
- qtkernel/src/modules/qt_core.pri         |   11 ++++++
- qtkernel/src/modules/qt_dbus.pri         |   12 ++++++
- qtkernel/src/modules/qt_gui.pri          |   11 ++++++
- qtkernel/src/modules/qt_network.pri      |   11 ++++++
- qtkernel/src/modules/qt_opengl.pri       |   12 ++++++
- qtkernel/src/modules/qt_openvg.pri       |   12 ++++++
- qtkernel/src/modules/qt_sql.pri          |   11 ++++++
- qtkernel/src/modules/qt_svg.pri          |   11 ++++++
- qtkernel/src/modules/qt_testlib.pri      |   12 ++++++
- qtkernel/src/modules/qt_xml.pri          |   11 ++++++
- qtkernel/sync.profile                    |   13 +++++++
+ qtbase/bin/syncqt                      |   59 ++++++++++++++++++++++++++++--
+ qtbase/mkspecs/features/qt_config.prf  |    9 ++++-
+ qtbase/src/modules/qt_core.pri         |   11 ++++++
+ qtbase/src/modules/qt_dbus.pri         |   12 ++++++
+ qtbase/src/modules/qt_gui.pri          |   11 ++++++
+ qtbase/src/modules/qt_network.pri      |   11 ++++++
+ qtbase/src/modules/qt_opengl.pri       |   12 ++++++
+ qtbase/src/modules/qt_openvg.pri       |   12 ++++++
+ qtbase/src/modules/qt_sql.pri          |   11 ++++++
+ qtbase/src/modules/qt_svg.pri          |   11 ++++++
+ qtbase/src/modules/qt_testlib.pri      |   12 ++++++
+ qtbase/src/modules/qt_xml.pri          |   11 ++++++
+ qtbase/sync.profile                    |   13 +++++++
  qtxmlpatterns/modules/qt_xmlpatterns.pri |   11 ++++++
  qtxmlpatterns/sync.profile               |    3 ++
  15 files changed, 205 insertions(+), 4 deletions(-)
- create mode 100644 qtkernel/src/modules/qt_core.pri
- create mode 100644 qtkernel/src/modules/qt_dbus.pri
- create mode 100644 qtkernel/src/modules/qt_gui.pri
- create mode 100644 qtkernel/src/modules/qt_network.pri
- create mode 100644 qtkernel/src/modules/qt_opengl.pri
- create mode 100644 qtkernel/src/modules/qt_openvg.pri
- create mode 100644 qtkernel/src/modules/qt_sql.pri
- create mode 100644 qtkernel/src/modules/qt_svg.pri
- create mode 100644 qtkernel/src/modules/qt_testlib.pri
- create mode 100644 qtkernel/src/modules/qt_xml.pri
+ create mode 100644 qtbase/src/modules/qt_core.pri
+ create mode 100644 qtbase/src/modules/qt_dbus.pri
+ create mode 100644 qtbase/src/modules/qt_gui.pri
+ create mode 100644 qtbase/src/modules/qt_network.pri
+ create mode 100644 qtbase/src/modules/qt_opengl.pri
+ create mode 100644 qtbase/src/modules/qt_openvg.pri
+ create mode 100644 qtbase/src/modules/qt_sql.pri
+ create mode 100644 qtbase/src/modules/qt_svg.pri
+ create mode 100644 qtbase/src/modules/qt_testlib.pri
+ create mode 100644 qtbase/src/modules/qt_xml.pri
  create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri
 
-diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt
+diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt
 index 7e5fc44..bceab27 100755
---- a/qtkernel/bin/syncqt
-+++ b/qtkernel/bin/syncqt
+--- a/qtbase/bin/syncqt
++++ b/qtbase/bin/syncqt
 @@ -23,8 +23,16 @@ our $basedir;
  our $quoted_basedir;
  
  
-+# try to figure out where QtKernel is located
++# try to figure out where QtBase is located
 +# normally the script location should be enough, if not fall back to
 +# QTDIR environment variable. If that doesn't work, later ask the
 +# user to use the -qtdir option explicitly.
-+my $qtkerneldir = dirname(dirname($0));
-+$qtkerneldir = $ENV{"QTDIR"} if ($qtkerneldir !~ /qtkernel/);
-+$qtkerneldir =~ s=\\=/=g if (defined $qtkerneldir);
++my $qtbasedir = dirname(dirname($0));
++$qtbasedir = $ENV{"QTDIR"} if ($qtbasedir !~ /qtbase/);
++$qtbasedir =~ s=\\=/=g if (defined $qtbasedir);
 +
  # will be defined based on the modules sync.profile
 -our (%modules, %moduleheaders, %classnames, %mastercontent);
@@ -86,7 +86,7 @@ index 7e5fc44..bceab27 100755
      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 "  -qtdir <PATH>         Set the path to QtKernel           (detected: " . (defined $qtkerneldir ? $qtkerneldir : "-none-") . ")\n";
++    print "  -qtdir <PATH>         Set the path to QtBase           (detected: " . (defined $qtbasedir ? $qtbasedir : "-none-") . ")\n";
      print "  -quiet                Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n";
 -    print "  -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n";
 +    print "  -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR>\n";
@@ -128,8 +128,8 @@ index 7e5fc44..bceab27 100755
          $create_uic_class_map = 0;
 +    } elsif ($var eq "qtdir") {
 +        if($val) {
-+            $qtkerneldir = $val;
-+            $qtkerneldir =~ s=\\=/=g;
++            $qtbasedir = $val;
++            $qtbasedir =~ s=\\=/=g;
 +        } else {
 +            die "The -qtdir option requires an argument";
 +        }
@@ -142,14 +142,14 @@ index 7e5fc44..bceab27 100755
      }
  }
  
-+# if the $qtkerneldir neither has 'qtkernel' somewhere in its path, nor a
++# if the $qtbasedir neither has 'qtbase' somewhere in its path, nor a
 +# '.qmake.cache' file in its directory, we assume it's not a valid path
-+# (remember that a yet-to-be-built qtkernel doesn't have this file either,
-+# thus the 'qtkernel' path check!)
-+die "Cannot automatically detect/use provided path to QtKernel's build directory!\n" .
-+    "QTDIR detected/provided: " . (defined $qtkerneldir ? $qtkerneldir : "-none-") . "\n" .
++# (remember that a yet-to-be-built qtbase doesn't have this file either,
++# thus the 'qtbase' path check!)
++die "Cannot automatically detect/use provided path to QtBase's build directory!\n" .
++    "QTDIR detected/provided: " . (defined $qtbasedir ? $qtbasedir : "-none-") . "\n" .
 +    "Please -qtdir option to provide the correct path.\nsyncqt failed"
-+        if (!defined $qtkerneldir || (!-e "$qtkerneldir/.qmake.cache" && $qtkerneldir !~ /qtkernel/));
++        if (!defined $qtbasedir || (!-e "$qtbasedir/.qmake.cache" && $qtbasedir !~ /qtbase/));
 +
  # 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);
@@ -159,12 +159,12 @@ index 7e5fc44..bceab27 100755
              close HEADERS_PRI_FILE;
          }
 +
-+        # create forwarding module pri in qtkernel/mkspecs/modules
++        # create forwarding module pri in qtbase/mkspecs/modules
 +        unless ($no_module_fwd) {
 +            my $modulepri = $modulepris{$lib};
 +            if (-e $modulepri) {
 +                my $modulepriname = basename($modulepri);
-+                my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname";
++                my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname";
 +                open MODULE_PRI_FILE, ">$moduleprifwd";
 +                print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n";
 +                print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n";
@@ -178,10 +178,10 @@ index 7e5fc44..bceab27 100755
      }
  }
  unless($showonly || !$create_uic_class_map) {
-diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf
+diff --git a/qtbase/mkspecs/features/qt_config.prf b/qtbase/mkspecs/features/qt_config.prf
 index de1cac4..2973c7e 100644
---- a/qtkernel/mkspecs/features/qt_config.prf
-+++ b/qtkernel/mkspecs/features/qt_config.prf
+--- a/qtbase/mkspecs/features/qt_config.prf
++++ b/qtbase/mkspecs/features/qt_config.prf
 @@ -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))))) {
@@ -198,11 +198,11 @@ index de1cac4..2973c7e 100644
     }
  }
  
-diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri
+diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri
 new file mode 100644
 index 0000000..742aefe
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_core.pri
++++ b/qtbase/src/modules/qt_core.pri
 @@ -0,0 +1,11 @@
 +QT_CORE_VERSION = $$QT_VERSION
 +QT_CORE_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -215,11 +215,11 @@ index 0000000..742aefe
 +QT.core.depends =
 +
 +QT_CONFIG += core
-diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri
+diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri
 new file mode 100644
 index 0000000..fddcbf7
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_dbus.pri
++++ b/qtbase/src/modules/qt_dbus.pri
 @@ -0,0 +1,12 @@
 +QT_DBUS_VERSION = $$QT_VERSION
 +QT_DBUS_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -233,11 +233,11 @@ index 0000000..fddcbf7
 +QT.dbus.CONFIG = dbusadaptors dbusinterfaces
 +
 +QT_CONFIG += dbus
-diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri
+diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri
 new file mode 100644
 index 0000000..6da7431
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_gui.pri
++++ b/qtbase/src/modules/qt_gui.pri
 @@ -0,0 +1,11 @@
 +QT_GUI_VERSION = $$QT_VERSION
 +QT_GUI_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -250,11 +250,11 @@ index 0000000..6da7431
 +QT.gui.depends = core network
 +
 +QT_CONFIG += gui
-diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri
+diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri
 new file mode 100644
 index 0000000..4d32079
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_network.pri
++++ b/qtbase/src/modules/qt_network.pri
 @@ -0,0 +1,11 @@
 +QT_CORE_VERSION = $$QT_VERSION
 +QT_NETWORK_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -267,11 +267,11 @@ index 0000000..4d32079
 +QT.network.depends = core
 +
 +QT_CONFIG += network
-diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri
+diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri
 new file mode 100644
 index 0000000..9ad1425
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_opengl.pri
++++ b/qtbase/src/modules/qt_opengl.pri
 @@ -0,0 +1,12 @@
 +QT_OPENGL_VERSION = $$QT_VERSION
 +QT_OPENGL_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -285,11 +285,11 @@ index 0000000..9ad1425
 +QT.opengl.CONFIG = opengl
 +
 +QT_CONFIG += opengl
-diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri
+diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri
 new file mode 100644
 index 0000000..612bd13
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_openvg.pri
++++ b/qtbase/src/modules/qt_openvg.pri
 @@ -0,0 +1,12 @@
 +QT_OPENVG_VERSION = $$QT_VERSION
 +QT_OPENVG_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -303,11 +303,11 @@ index 0000000..612bd13
 +QT.openvg.CONFIG = openvg
 +
 +QT_CONFIG += openvg
-diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri
+diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri
 new file mode 100644
 index 0000000..bf5917b
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_sql.pri
++++ b/qtbase/src/modules/qt_sql.pri
 @@ -0,0 +1,11 @@
 +QT_SQL_VERSION = $$QT_VERSION
 +QT_SQL_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -320,11 +320,11 @@ index 0000000..bf5917b
 +QT.sql.depends = core
 +
 +QT_CONFIG += sql
-diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri
+diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri
 new file mode 100644
 index 0000000..faccb78
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_svg.pri
++++ b/qtbase/src/modules/qt_svg.pri
 @@ -0,0 +1,11 @@
 +QT_SVG_VERSION = $$QT_VERSION
 +QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -337,11 +337,11 @@ index 0000000..faccb78
 +QT.svg.depends = core gui
 +
 +QT_CONFIG += svg
-diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri
+diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri
 new file mode 100644
 index 0000000..0f65438
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_testlib.pri
++++ b/qtbase/src/modules/qt_testlib.pri
 @@ -0,0 +1,12 @@
 +QT_TEST_VERSION = $$QT_VERSION
 +QT_TEST_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -355,11 +355,11 @@ index 0000000..0f65438
 +QT.testlib.CONFIG = console
 +
 +QT_CONFIG += testlib
-diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri
+diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri
 new file mode 100644
 index 0000000..45dbc667
 --- /dev/null
-+++ b/qtkernel/src/modules/qt_xml.pri
++++ b/qtbase/src/modules/qt_xml.pri
 @@ -0,0 +1,11 @@
 +QT_XML_VERSION = $$QT_VERSION
 +QT_XML_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -372,10 +372,10 @@ index 0000000..45dbc667
 +QT.xml.depends = core
 +
 +QT_CONFIG += xml
-diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile
+diff --git a/qtbase/sync.profile b/qtbase/sync.profile
 index 7d2e4b1..c8ef4fc 100644
---- a/qtkernel/sync.profile
-+++ b/qtkernel/sync.profile
+--- a/qtbase/sync.profile
++++ b/qtbase/sync.profile
 @@ -37,6 +37,19 @@
      "openvg" => "#include <QtOpenVG/QtOpenVG>\n",
      "xml" => "#include <QtXml/QtXml>\n",