From b54378492857bd9381f763aeca19b9183effee3b Mon Sep 17 00:00:00 2001
From: Christian Tismer <ctismer@gmail.com>
Date: Tue, 19 Apr 2016 14:15:05 +0200
Subject: fix the name pyside2uic

This was modified, but not corrected in setup.py
---
 setup.py              | 24 ++++++++++++------------
 sources/pyside2       |  2 +-
 sources/pyside2-tools |  2 +-
 sources/shiboken2     |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/setup.py b/setup.py
index 42d919af4..e308c3b20 100644
--- a/setup.py
+++ b/setup.py
@@ -287,7 +287,7 @@ for n in ["pyside_package", "build", "PySide2-%s" % __version__]:
             print('ignored error: {}'.format(e))
 
 # Prepare package folders
-for pkg in ["pyside_package/PySide2", "pyside_package/pysideuic"]:
+for pkg in ["pyside_package/PySide2", "pyside_package/pyside2uic"]:
     pkg_dir = os.path.join(script_dir, pkg)
     os.makedirs(pkg_dir)
 
@@ -711,15 +711,15 @@ class pyside_build(_build):
             "{site_packages_dir}/shiboken2.so",
             "{dist_dir}/PySide2/shiboken2.so",
             vars=vars)
-        # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic
+        # <install>/lib/site-packages/pyside2uic/* -> <setup>/pyside2uic
         copydir(
-            "{site_packages_dir}/pysideuic",
-            "{dist_dir}/pysideuic",
+            "{site_packages_dir}/pyside2uic",
+            "{dist_dir}/pyside2uic",
             force=False, vars=vars)
         if sys.version_info[0] > 2:
-            rmtree("{dist_dir}/pysideuic/port_v2".format(**vars))
+            rmtree("{dist_dir}/pyside2uic/port_v2".format(**vars))
         else:
-            rmtree("{dist_dir}/pysideuic/port_v3".format(**vars))
+            rmtree("{dist_dir}/pyside2uic/port_v3".format(**vars))
         # <install>/bin/pyside2-uic -> PySide2/scripts/uic.py
         makefile(
             "{dist_dir}/PySide2/scripts/__init__.py",
@@ -838,15 +838,15 @@ class pyside_build(_build):
                 "{build_dir}/shiboken2/shibokenmodule/shiboken2{dbgPostfix}.pdb",
                 "{dist_dir}/PySide2/shiboken2{dbgPostfix}.pdb",
                 vars=vars)
-        # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic
+        # <install>/lib/site-packages/pyside2uic/* -> <setup>/pyside2uic
         copydir(
-            "{site_packages_dir}/pysideuic",
-            "{dist_dir}/pysideuic",
+            "{site_packages_dir}/pyside2uic",
+            "{dist_dir}/pyside2uic",
             force=False, vars=vars)
         if sys.version_info[0] > 2:
-            rmtree("{dist_dir}/pysideuic/port_v2".format(**vars))
+            rmtree("{dist_dir}/pyside2uic/port_v2".format(**vars))
         else:
-            rmtree("{dist_dir}/pysideuic/port_v3".format(**vars))
+            rmtree("{dist_dir}/pyside2uic/port_v3".format(**vars))
         # <install>/bin/pyside2-uic -> PySide2/scripts/uic.py
         makefile(
             "{dist_dir}/PySide2/scripts/__init__.py",
@@ -1049,7 +1049,7 @@ setup(
     url = 'http://www.pyside.org',
     download_url = 'https://download.qt-project.org/official_releases/pyside2/',
     license = 'LGPL',
-    packages = ['PySide2', 'pysideuic'],
+    packages = ['PySide2', 'pyside2uic'],
     package_dir = {'': 'pyside_package'},
     include_package_data = True,
     zip_safe = False,
diff --git a/sources/pyside2 b/sources/pyside2
index 7006f3545..131fdfd1a 160000
--- a/sources/pyside2
+++ b/sources/pyside2
@@ -1 +1 @@
-Subproject commit 7006f35459fb41db6f5087217c1cdc0354a38568
+Subproject commit 131fdfd1a89a257094148c07c630f136752c703b
diff --git a/sources/pyside2-tools b/sources/pyside2-tools
index 7d3823d1c..1eb5ccf52 160000
--- a/sources/pyside2-tools
+++ b/sources/pyside2-tools
@@ -1 +1 @@
-Subproject commit 7d3823d1cae8fd893d284a72dd603fdeed54eff6
+Subproject commit 1eb5ccf5208d775e1e70b2332d9a61df00612801
diff --git a/sources/shiboken2 b/sources/shiboken2
index d597c044d..6064eadc4 160000
--- a/sources/shiboken2
+++ b/sources/shiboken2
@@ -1 +1 @@
-Subproject commit d597c044d1938975cda33a0bfeafd6becb9c9ec9
+Subproject commit 6064eadc4e861315240e5d61ed4dbf91764bd358
-- 
cgit v1.2.3