aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-29 08:08:36 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-29 08:08:36 +0100
commit1484dc600a35ea5bd1517ed945902151ff293c14 (patch)
tree11f9de6473cea409ef5d977def8508f72d4d7630
parent1c9e0d95263480a5ae5d645cabb41f835d1dbb70 (diff)
parent0022a9ecb7690a3bd9a7d4ce0880d1cecc937462 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.9
-rw-r--r--build_history/blacklist.txt4
-rw-r--r--setup.py2
-rw-r--r--sources/pyside2/PySide2/support/signature/mapping.py1
-rw-r--r--sources/pyside2/PySide2/support/signature/parser.py2
4 files changed, 6 insertions, 3 deletions
diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
index 6cf7ea2e7..267b50b16 100644
--- a/build_history/blacklist.txt
+++ b/build_history/blacklist.txt
@@ -76,4 +76,6 @@
win32
linux
darwin
-
+# Disable signature existence test for now on dev
+[registry::existence_test]
+ qt5.11
diff --git a/setup.py b/setup.py
index 1b4c92072..092dac4c1 100644
--- a/setup.py
+++ b/setup.py
@@ -1464,7 +1464,7 @@ class pyside_build(_build):
qt_lib_dir = self.qtinfo.libs_dir
if OPTION_STANDALONE:
qt_lib_dir = "$ORIGIN/Qt/lib"
- final_rpath = local_rpath + ':' + qt_lib_dir
+ final_rpath = local_rpath + ':' + qt_lib_dir
cmd = [patchelf_path, '--set-rpath', final_rpath, srcpath]
if run_process(cmd) != 0:
raise RuntimeError("Error patching rpath in " + srcpath)
diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py
index 8cb0bbf8e..50ae27718 100644
--- a/sources/pyside2/PySide2/support/signature/mapping.py
+++ b/sources/pyside2/PySide2/support/signature/mapping.py
@@ -310,6 +310,7 @@ def init_QtGui():
"PySide2.QtGui.QPlatformSurface": Virtual("PySide2.QtGui.QPlatformSurface"), # hmm...
"QList< QTouchEvent.TouchPoint >()": [], # XXX improve?
"QPixmap()": Default("PySide2.QtGui.QPixmap"), # can't create without qApp
+ "PySide2.QtCore.uint8_t": int, # macOS 5.9
"zero(uint32_t)": 0,
"zero(PySide2.QtGui.QWindow)": None,
"zero(PySide2.QtGui.QOpenGLContext)": None,
diff --git a/sources/pyside2/PySide2/support/signature/parser.py b/sources/pyside2/PySide2/support/signature/parser.py
index 0b81dba54..c55973632 100644
--- a/sources/pyside2/PySide2/support/signature/parser.py
+++ b/sources/pyside2/PySide2/support/signature/parser.py
@@ -126,7 +126,7 @@ def make_good_value(thing, valtype):
if valtype and repr(ret).startswith("<"):
thing = 'Instance("{}")'.format(thing)
return eval(thing, namespace)
- except (SyntaxError, TypeError, NameError):
+ except Exception:
pass
def try_to_guess(thing, valtype):