summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Lacko <backup.rlacko@gmail.com>2013-08-16 10:09:04 +0200
committerRoman Lacko <backup.rlacko@gmail.com>2013-08-16 10:09:04 +0200
commit36d8fa48839144e6a57b787d3f42e7a68f8fd0f0 (patch)
tree5b7a60cbeb011e77e500fb6f30c8e797fe6157dc
parentb82bcd4598024359152723511a97db77b8e0c718 (diff)
Bump PySide modules to version 1.2.11.2.1
-rw-r--r--CHANGES.rst9
-rw-r--r--setup.py10
2 files changed, 12 insertions, 7 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index ac00dc0b..acc58b29 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
Changes
=======
-1.2.1 (2013-07-??)
+1.2.1 (2013-08-16)
------------------
Major changes
@@ -10,15 +10,20 @@ Major changes
PySide
******
+- In memory qt.conf generation and registration
+
Shiboken
********
+- Better support for more than 9 arguments to methods
+- Avoiding a segfault when getting the .name attribute on an enum value with no name
+
PySide-setup
************
+- Switched to the new setuptools (v0.9.8) which has been merged with Distribute again and works for Python 2 and 3 with one codebase
- Support for building windows binaries with only Windows SDK installed (Visual Studio is no more required)
- Removed --msvc-version option. Required msvc compiler version is now resolved from python interpreter version
-- Switched to the new setuptools (v0.9.8) which has been merged with Distribute again and works for Python 2 and 3 with one codebase.
1.2.0 (2013-07-02)
------------------
diff --git a/setup.py b/setup.py
index 6229cc51..272810e4 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.1"
submodules = {
- __version__: [
- ["shiboken", "master"],
- ["pyside", "master"],
- ["pyside-tools", "master"],
+ '1.2.1': [
+ ["shiboken", "1.2.1"],
+ ["pyside", "1.2.1"],
+ ["pyside-tools", "0.2.15"],
["pyside-examples", "master"],
],
'1.2.0': [