~thopiekar/pyside/+git/pyside:4.8

Last commit made on 2014-07-08
Get this branch:
git clone -b 4.8 https://git.launchpad.net/~thopiekar/pyside/+git/pyside

Branch merges

Branch information

Name:
4.8
Repository:
lp:~thopiekar/pyside/+git/pyside

Recent commits

0c64d1b... by Pankaj Pandey <email address hidden>

PYSIDE-164: Fix possible deadlock on signal connect/emit

Signal connect/emit acquire a lock on the QObject, and can
happen from python code (which has acquired the GIL) or
internal QtCode (without acquiring the GIL).
So we always need to release the GIL to prevent out-of-order
acquisition of the locks causing deadlock.

Change-Id: I1cf47a73c2b60627e322d8ef3fa4c3efdebd4c02
Reviewed-by: John Ehresman <email address hidden>

8dfeddb... by John Ehresman

Version bump

Change-Id: I2851b9fa2af6781cddd40bd364ed4a42f5211004
Reviewed-by: John Cummings <email address hidden>

4c5cc42... by Pankaj Pandey <email address hidden>

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 address hidden>

10ce3bc... by Matthew Woehlke <email address hidden>

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 address hidden>

79d3792... by Matthew Woehlke <email address hidden>

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 address hidden>

80a58c4... by Matthew Woehlke <email address hidden>

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 address hidden>

1497679... by "Joel B. Mohler" <email address hidden>

use file system encoding instead of assumed 'ascii'

Task-number: PYSIDE-211
Change-Id: I4233d093cf2abe1eeb006fd836c10d1ddcbc9858
Reviewed-by: Roman Lacko <email address hidden>
Reviewed-by: Christian Tismer <email address hidden>
Reviewed-by: John Ehresman <email address hidden>

d2a47ab... by Roman Lacko

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 address hidden>

a12de51... by John Ehresman

Bump version number to 1.2.1

Change-Id: Icc64a1b0f63ae05f897a210664fdb41b4f9746c4
Reviewed-by: Roman Lacko <email address hidden>
Reviewed-by: John Cummings <email address hidden>

817a5c9... by "Joel B. Mohler" <email address hidden>

add diagnostics and fallbacks for frozen distributions

Change-Id: I519c912999283bf7e07f8d34201f9e67c7d6216e
Reviewed-by: Roman Lacko <email address hidden>
Reviewed-by: John Ehresman <email address hidden>