From cf608f65ebc0866f74d0c9aa566dc0fc2a2f4a49 Mon Sep 17 00:00:00 2001
From: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Date: Thu, 26 Apr 2018 11:13:16 +0200
Subject: Remove currentThreadId binding

Since this method should not be used in any
application code, we should remove it from
PySide2.
Removing also the test registry.

https://doc.qt.io/qt-5/qthread.html#currentThreadId

Task-number: PYSIDE-275
Change-Id: I152b36ccfa4342d4d6b916d8b2fe228e4fe4a1c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 1 +
 sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py  | 1 -
 sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py  | 1 -
 sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py   | 1 -
 sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py   | 1 -
 sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py   | 1 -
 sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py   | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'sources/pyside2')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 6db3691a6..8c50413cb 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -2015,6 +2015,7 @@
   </object-type>
   <object-type name="QThread">
     <enum-type name="Priority"/>
+    <modify-function signature="currentThreadId()" remove="all"/>
     <modify-function signature="run()" thread="yes" />
     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
     <modify-function signature="msleep(unsigned long)" allow-thread="yes" />
diff --git a/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py b/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py
index 3e18f9efc..3bdced8eb 100644
--- a/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py
+++ b/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py
@@ -2235,7 +2235,6 @@ if "PySide2.QtCore" in sys.modules:
     # class PySide2.QtCore.QThread:
         "QThread.__init__": ('PySide2.QtCore.QObject',),
         "QThread.currentThread": (),
-        "QThread.currentThreadId": (),
         "QThread.event": ('PySide2.QtCore.QEvent',),
         "QThread.eventDispatcher": (),
         "QThread.exec_": (),
diff --git a/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py b/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py
index bad44da92..553e3e317 100644
--- a/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py
+++ b/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py
@@ -2321,7 +2321,6 @@ if "PySide2.QtCore" in sys.modules:
     # class PySide2.QtCore.QThread:
         "QThread.__init__": ('PySide2.QtCore.QObject',),
         "QThread.currentThread": (),
-        "QThread.currentThreadId": (),
         "QThread.event": ('PySide2.QtCore.QEvent',),
         "QThread.eventDispatcher": (),
         "QThread.exec_": (),
diff --git a/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py b/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py
index 4edcc2187..65b07b569 100644
--- a/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py
+++ b/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py
@@ -2234,7 +2234,6 @@ if "PySide2.QtCore" in sys.modules:
     # class PySide2.QtCore.QThread:
         "QThread.__init__": ('PySide2.QtCore.QObject',),
         "QThread.currentThread": (),
-        "QThread.currentThreadId": (),
         "QThread.event": ('PySide2.QtCore.QEvent',),
         "QThread.eventDispatcher": (),
         "QThread.exec_": (),
diff --git a/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py b/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py
index 59d696884..277277d75 100644
--- a/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py
+++ b/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py
@@ -2320,7 +2320,6 @@ if "PySide2.QtCore" in sys.modules:
     # class PySide2.QtCore.QThread:
         "QThread.__init__": ('PySide2.QtCore.QObject',),
         "QThread.currentThread": (),
-        "QThread.currentThreadId": (),
         "QThread.event": ('PySide2.QtCore.QEvent',),
         "QThread.eventDispatcher": (),
         "QThread.exec_": (),
diff --git a/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py b/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py
index 7e8cccaa3..27dcd61a1 100644
--- a/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py
+++ b/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py
@@ -2239,7 +2239,6 @@ if "PySide2.QtCore" in sys.modules:
     # class PySide2.QtCore.QThread:
         "QThread.__init__": ('PySide2.QtCore.QObject',),
         "QThread.currentThread": (),
-        "QThread.currentThreadId": (),
         "QThread.event": ('PySide2.QtCore.QEvent',),
         "QThread.eventDispatcher": (),
         "QThread.exec_": (),
diff --git a/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py b/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py
index 8d7c8a7e0..9378fe433 100644
--- a/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py
+++ b/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py
@@ -2325,7 +2325,6 @@ if "PySide2.QtCore" in sys.modules:
     # class PySide2.QtCore.QThread:
         "QThread.__init__": ('PySide2.QtCore.QObject',),
         "QThread.currentThread": (),
-        "QThread.currentThreadId": (),
         "QThread.event": ('PySide2.QtCore.QEvent',),
         "QThread.eventDispatcher": (),
         "QThread.exec_": (),
-- 
cgit v1.2.3