Updated to PySide 1.2.2.

pyside-qt4.8+1.2.0/CMakeLists.txt → pyside-qt4.8+1.2.2/CMakeLists.txt

@@ -62,7 +62,7 @@ endif()
 set(BINDING_NAME PySide)
 set(BINDING_API_MAJOR_VERSION "1")
 set(BINDING_API_MINOR_VERSION "2")
-set(BINDING_API_MICRO_VERSION "0")
+set(BINDING_API_MICRO_VERSION "2")
 set(BINDING_API_RELEASE_LEVEL "final") # alpha, beta, rc, or final
 set(BINDING_API_SERIAL 0) # leave as 0 when release level is final
 set(BINDING_API_VERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" CACHE STRING "PySide version" FORCE)

pyside-qt4.8+1.2.0/ChangeLog → pyside-qt4.8+1.2.2/ChangeLog

@@ -1,3 +1,121 @@
+commit 8dfeddb3a679d2f6fdb1ae01f8eee77c9bec7edd
+Author: John Ehresman <[email protected]>
+Date:   Tue Apr 22 08:06:16 2014 -0700
+
+    Version bump
+
+    Change-Id: I2851b9fa2af6781cddd40bd364ed4a42f5211004
+    Reviewed-by: John Cummings <[email protected]>
+
+commit 4c5cc426a4841657d25b70df4080c220ed16bb7c
+Author: Pankaj Pandey <[email protected]>
+Date:   Sun Sep 29 18:33:55 2013 +0530
+
+    Fix PYSIDE-190
+
+    QCoreApplication would deadlock on exit if the global
+    QThreadPool.globalInstance() is running a QRunnable with python
+    code because the destroyQCoreApplication function would not
+    release the the GIL which `delete`ing the QCoreApplication.
+
+    Change-Id: I7b8a3bbd33f86050368a9357fa93e25a642b4ac5
+    Reviewed-by: John Ehresman <[email protected]>
+
+commit 10ce3bcbcdcb7e846c21c3f4055968a33124fd01
+Author: Matthew Woehlke <[email protected]>
+Date:   Wed Aug 7 13:32:37 2013 -0400
+
+    Fix shadowed virtuals
+
+    Change GlobalReceiver to explicitly 'use' [dis]connectNotify of the base
+    class in order to avoid hiding these with its own overloads. This fixes
+    the only (current) -Woverloaded-virtual warning.
+
+    Change-Id: I364b9939f9078029861054051148c319071fbbe1
+    Reviewed-by: John Ehresman <[email protected]>
+
+commit 79d3792cae3f2b6e97ee4f41974d51dfec94a9bc
+Author: Matthew Woehlke <[email protected]>
+Date:   Wed Aug 7 13:30:42 2013 -0400
+
+    Avoid narrowing conversion
+
+    Add explicit casts when initializing an int[] using {}'s, as required by
+    C++11 to be "well formed". This fixes the only (current) -Wnarrowing
+    warning.
+
+    Change-Id: I7f190549a8a54a9061678a926d5478256c2084be
+    Reviewed-by: John Ehresman <[email protected]>
+
+commit 80a58c4b0bdf0f3273957c72b3a77f4fae442432
+Author: Matthew Woehlke <[email protected]>
+Date:   Wed Aug 7 13:26:24 2013 -0400
+
+    Fix bug PYSIDE-172: multiple rules for file
+
+    Remove moc_qpytextobject.cxx from the list of Shiboken-generated files,
+    as it is properly generated by MOC, and being in both places causes some
+    generators (e.g. Ninja) to be unhappy about having multiple rules that
+    (claim to) generate it.
+
+    Change-Id: I2458502852f792661120f561a59ad9a198286005
+    Reviewed-by: John Ehresman <[email protected]>
+
+commit 14976792ee1360c02b43e12d246b4de2ebdfd8a3
+Author: Joel B. Mohler <[email protected]>
+Date:   Mon Jan 20 12:38:32 2014 -0500
+
+    use file system encoding instead of assumed 'ascii'
+
+    Task-number: PYSIDE-211
+    Change-Id: I4233d093cf2abe1eeb006fd836c10d1ddcbc9858
+    Reviewed-by: Roman Lacko <[email protected]>
+    Reviewed-by: Christian Tismer <[email protected]>
+    Reviewed-by: John Ehresman <[email protected]>
+
+commit d2a47ab8f27af7e74d34797464da85c128c17c37
+Author: Roman Lacko <[email protected]>
+Date:   Wed Jul 24 15:19:22 2013 +0200
+
+    Register qt.conf in Qt resource system to override the Qt builtins
+
+    Register qt.conf in Qt resource system to override the built-in
+    configuration variables if there is no default qt.conf in
+    executable folder and qt.conf was not already registered in Qt
+    resource system
+
+    Change-Id: Ibed9f9e791dab575ef26bc54b351e5f5d4870542
+    Reviewed-by: John Ehresman <[email protected]>
+
+commit a12de51b654973d965b1888b4dd3c539422f71db
+Author: John Ehresman <[email protected]>
+Date:   Sun Jul 21 18:04:50 2013 -0400
+
+    Bump version number to 1.2.1
+
+    Change-Id: Icc64a1b0f63ae05f897a210664fdb41b4f9746c4
+    Reviewed-by: Roman Lacko <[email protected]>
+    Reviewed-by: John Cummings <[email protected]>
+
+commit 817a5c9bd39d3a22e2a7db9aa497059be57d58d7
+Author: Joel B. Mohler <[email protected]>
+Date:   Thu Jul 11 11:40:05 2013 -0400
+
+    add diagnostics and fallbacks for frozen distributions
+
+    Change-Id: I519c912999283bf7e07f8d34201f9e67c7d6216e
+    Reviewed-by: Roman Lacko <[email protected]>
+    Reviewed-by: John Ehresman <[email protected]>
+
+commit c78e245477852092fd9231061b521ce03d8aafcd
+Author: Roman Lacko <[email protected]>
+Date:   Wed Jul 10 22:40:02 2013 +0200
+
+    Fixed licenses
+
+    Change-Id: I55b76b47b1dca0ea290f633b1de070bb8d6995e1
+    Reviewed-by: John Ehresman <[email protected]>
+
 commit 0f36142d2aa524c2a7389f124aa6bbbbe052e7f7
 Author: John Ehresman <[email protected]>
 Date:   Fri Jun 28 10:28:40 2013 -0500

pyside-qt4.8+1.2.0/PySide/QtCore/typesystem_core_common.xml → pyside-qt4.8+1.2.2/PySide/QtCore/typesystem_core_common.xml

@@ -919,13 +919,25 @@
 
   <inject-code class="target" position="end">
     { // Avoid name clash
+        Shiboken::AutoDecRef regFunc((PyObject*)NULL);
         Shiboken::AutoDecRef atexit(Shiboken::Module::import("atexit"));
-        Shiboken::AutoDecRef regFunc(PyObject_GetAttrString(atexit, "register"));
-        PyObject* shutDownFunc = PyObject_GetAttrString(module, "__moduleShutdown");
-        Shiboken::AutoDecRef args(PyTuple_New(1));
-        PyTuple_SET_ITEM(args, 0, shutDownFunc);
-        Shiboken::AutoDecRef retval(PyObject_Call(regFunc, args, 0));
-        Q_ASSERT(!retval.isNull());
+        if (atexit.isNull()) {
+            qWarning() &lt;&lt; "Module atexit not found for registering __moduleShutdown";
+            PyErr_Clear();
+        }else{
+            regFunc = PyObject_GetAttrString(atexit, "register");
+            if (regFunc.isNull()) {
+                qWarning() &lt;&lt; "Function atexit.register not found for registering __moduleShutdown";
+                PyErr_Clear();
+            }
+        }
+        if (!atexit.isNull() &amp;&amp; !regFunc.isNull()){
+            PyObject* shutDownFunc = PyObject_GetAttrString(module, "__moduleShutdown");
+            Shiboken::AutoDecRef args(PyTuple_New(1));
+            PyTuple_SET_ITEM(args, 0, shutDownFunc);
+            Shiboken::AutoDecRef retval(PyObject_Call(regFunc, args, 0));
+            Q_ASSERT(!retval.isNull());
+        }
     }
   </inject-code>
 

pyside-qt4.8+1.2.0/PySide/QtGui/CMakeLists.txt → pyside-qt4.8+1.2.2/PySide/QtGui/CMakeLists.txt

@@ -403,7 +403,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwizard_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qworkspace_wrapper.cpp
 
 ${SPECIFIC_OS_FILES}
-${QPYTEXTOBJECT_MOC}
 ${QtGui_46_SRC}
 ${QtGui_47_SRC}
 ${QtGui_OPTIONAL_SRC}
@@ -434,7 +433,7 @@ create_pyside_module(QtGui
                      QtGui_deps
                      QtGui_typesystem_path
                      QtGui_SRC
-                     ""
+                     QPYTEXTOBJECT_MOC
                      ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml)
 
 install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/)

pyside-qt4.8+1.2.0/PySide/__init__.py.in → pyside-qt4.8+1.2.2/PySide/__init__.py.in

@@ -10,6 +10,16 @@ def _setupQtDirectories():
 
     pysideDir = _utils.get_pyside_dir()
 
+    # Register PySide qt.conf to override the built-in
+    # configuration variables, if there is no default qt.conf in
+    # executable folder
+    prefix = pysideDir.replace('\\', '/')
+    _utils.register_qt_conf(prefix=prefix,
+                            binaries=prefix,
+                            plugins=prefix+"/plugins",
+                            imports=prefix+"/imports",
+                            translations=prefix+"/translations")
+
     # On Windows add the PySide\openssl folder (if it exists) to the
     # PATH so the SSL DLLs can be found when Qt tries to dynamically
     # load them.  Tell Qt to load them and then reset the PATH.
@@ -28,28 +38,4 @@ def _setupQtDirectories():
             finally:
                 os.environ['PATH'] = path
 
-    # Tell Qt to look for plugins in the PySide package, if the
-    # plugins folder exists there, instead of just the default of
-    # looking only in Qt's install or build folder.
-    try:
-        from . import QtCore
-    except ImportError:
-        pass
-    else:
-        pluginsDir = os.path.join(pysideDir, 'plugins')
-        if os.path.exists(pluginsDir) and \
-               pluginsDir not in QtCore.QCoreApplication.libraryPaths():
-            QtCore.QCoreApplication.addLibraryPath(pluginsDir)
-
-    # Tell Qt to look for qml imports in the PySide package, if the
-    # imports folder exists there.
-    importsDir = os.path.join(pysideDir, 'imports')
-    if os.path.exists(importsDir):
-        if 'QML_IMPORT_PATH' in os.environ:
-            qml_import_path = os.environ['QML_IMPORT_PATH']
-            os.environ['QML_IMPORT_PATH'] = importsDir + os.pathsep + qml_import_path
-        else:
-            os.environ['QML_IMPORT_PATH'] = importsDir
-
-
 _setupQtDirectories()