1.2.2

3 files changed, 59 insertions, 17 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index acc58b298..f341b8d01 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,48 @@
 Changes
 =======
 
+1.2.2 (2014-04-24)
+------------------
+
+Complete list of changes and bug fixes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+PySide
+******
+
+- Fix PYSIDE-190: QCoreApplication would deadlock on exit if the global
+  QThreadPool.globalInstance() is running a QRunnable with python code
+- Change GlobalReceiver to explicitly 'use' [dis]connectNotify of the base
+  class in order to avoid hiding these with its own overloads.
+- Add explicit casts when initializing an int[] using {}'s, as required
+  by C++11 to be "well formed"
+- Fix PYSIDE-172: multiple rules for file
+- Use file system encoding instead of assumed 'ascii' when registering
+  qt.conf in Qt resource system
+
+Shiboken
+********
+
+- Remove rejection lines that cause the sample_list test to fail
+- Remove protected from samblebinding test
+- Add parsing of 'noexcept' keyword
+- Fix function rejections (i.e. support overloads)
+- Fix building with python 3.3 and 3.4
+- Doc: Stop requiring sphinx.ext.refcounting with Sphinx 1.2+
+- Fix for containers with 'const' values
+- Fix compilation issue on OS X 10.9
+- Only use fields in PyTypeObject when defining types
+- Fix buffer overrun processing macro definitions
+- Fix 'special' include handling
+- Fix finding container base classes
+- Refactor and improve added function resolving
+- Work around MSVC's deficient <cmath> in libsample/transform.cpp
+- Fix description of sample/transform unit test
+- Change wrapping and indent of some code in Handler::startElement to
+  improve consistency
+- Fix '%#' substitution for # > 9
+- Improve dependencies for tests
+
 1.2.1 (2013-08-16)
 ------------------
 
diff --git a/README.rst b/README.rst
index 5069efa94..a10a14d91 100644
--- a/README.rst
+++ b/README.rst
@@ -113,13 +113,13 @@ Building PySide distribution
 ----------------------------
 
 #. Download and extract `PySide source distribution
-   <https://pypi.python.org/packages/source/P/PySide/PySide-1.2.1.tar.gz>`_
+   <https://pypi.python.org/packages/source/P/PySide/PySide-1.2.2.tar.gz>`_
 
 #. Switch to the distribution directory:
 
    ::
 
-      c:\> cd PySide-1.2.1
+      c:\> cd PySide-1.2.2
 
 #. Build the `wheel` binary distribution:
 
@@ -146,7 +146,7 @@ Building PySide distribution from git repository
 
    ::
 
-      c:\> c:\Python27\python.exe setup.py bdist_wheel --version=1.2.1 --qmake=c:\Qt\4.8.5\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
+      c:\> c:\Python27\python.exe setup.py bdist_wheel --version=1.2.2 --qmake=c:\Qt\4.8.5\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
 
 #. To build the development version of ``PySide`` distribution, ignore the --version parameter:
 
@@ -161,7 +161,7 @@ Installing PySide distribution
    
    ::
 
-      c:\> c:\Python27\Scripts\pip install --use-wheel dist\PySide-1.2.1-cp27-none-win32.whl
+      c:\> c:\Python27\Scripts\pip install --use-wheel dist\PySide-1.2.2-cp27-none-win32.whl
 
 Installing PySide distribution into ``virtual`` Python environment
 ------------------------------------------------------------------
@@ -188,7 +188,7 @@ Installing PySide distribution into ``virtual`` Python environment
    
    ::
 
-      c:\> Scripts\pip install --use-wheel ..\dist\PySide-1.2.1-cp27-none-win32.whl
+      c:\> Scripts\pip install --use-wheel ..\dist\PySide-1.2.2-cp27-none-win32.whl
 
 Building PySide on a UNIX System (Ubuntu 12.04 - 14.04)
 =======================================================
@@ -226,19 +226,19 @@ Building PySide distribution
 
    ::
 
-      $ wget https://pypi.python.org/packages/source/P/PySide/PySide-1.2.1.tar.gz
+      $ wget https://pypi.python.org/packages/source/P/PySide/PySide-1.2.2.tar.gz
 
 #. Extract the source distribution:
 
    ::
 
-      $ tar -xvzf PySide-1.2.1.tar.gz
+      $ tar -xvzf PySide-1.2.2.tar.gz
 
 #. Switch to the distribution directory:
 
    ::
 
-      $ cd PySide-1.2.1
+      $ cd PySide-1.2.2
 
 #. Build the `wheel` binary distribution:
 
@@ -271,13 +271,13 @@ Building PySide distribution from git repository
 
    ::
 
-      $ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.1
+      $ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.2
 
 #. Optionally you can build standalone version of distribution with embedded Qt libs:
 
    ::
 
-      $ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.1 --standalone
+      $ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.2 --standalone
 
 #. To build the development version of ``PySide`` distribution, ignore the --version parameter:
 
@@ -292,7 +292,7 @@ Installing PySide distribution
    
    ::
 
-      $ sudo pip2.7 install --use-wheel dist/PySide-1.2.1-cp27-none-linux-x86_64.whl
+      $ sudo pip2.7 install --use-wheel dist/PySide-1.2.2-cp27-none-linux-x86_64.whl
 
 #. Run the post-install script to finish the package configuration:
    
@@ -325,7 +325,7 @@ Installing PySide distribution into ``virtual`` Python environment
    
    ::
 
-      $ bin/pip2.7 install --use-wheel ../dist/PySide-1.2.1-cp27-none-linux-x86_64.whl
+      $ bin/pip2.7 install --use-wheel ../dist/PySide-1.2.2-cp27-none-linux-x86_64.whl
 
 #. Run the post-install script to finish the package configuration:
    
diff --git a/setup.py b/setup.py
index 9fdfc64fc..250e1f291 100644
--- a/setup.py
+++ b/setup.py
@@ -26,13 +26,13 @@ OpenSSL: You can specify the location of OpenSSL DLLs with option --opnessl=</pa
     You can download OpenSSL for windows here: http://slproweb.com/products/Win32OpenSSL.html
 """
 
-__version__ = "1.3.0dev"
+__version__ = "1.2.2"
 
 submodules = {
-    '1.3.0dev': [
-        ["shiboken", "master"],
-        ["pyside", "master"],
-        ["pyside-tools", "master"],
+    '1.2.2': [
+        ["shiboken", "1.2.2"],
+        ["pyside", "1.2.2"],
+        ["pyside-tools", "0.2.15"],
         ["pyside-examples", "master"],
     ],
     '1.2.1': [