From acd9d6b8c5c03b74711725548388d3f1d1c44b92 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sun, 26 Mar 2023 22:47:56 +0200
Subject: [PATCH] Backward compatibility to Qt 5.12.8 and 5.12.11, fixed some
 test fails for Qt4

---
 scripts/mkqtdecl5/mkqtdecl.conf       | 2 ++
 src/gsiqt/qt5/QtNetwork/QtNetwork.pri | 1 -
 testdata/python/qtbinding.py          | 4 ++--
 testdata/ruby/qtbinding.rb            | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
index 3ae5c31f8..89cb28a7f 100644
--- a/scripts/mkqtdecl5/mkqtdecl.conf
+++ b/scripts/mkqtdecl5/mkqtdecl.conf
@@ -1017,6 +1017,8 @@ no_imports "QAbstractXmlNodeModel"  # base class is QSharedData which is not ava
 
 include "QDtlsError", [ "<QDtls>" ]
 
+drop_class "QPasswordDigestor" # only available on Qt 5.12.12, not before
+
 drop_method "QUrlInfo", /QUrlInfo::QUrlInfo\(.*permissions/ # too many arguments (13)
 drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*(const\s*)?quint8\s*\*/ # requires char *, a string version is available for IPv6
 drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*const\s+QIPv6Address/ # requires QIPv6Address struct, a string version is available for IPv6
diff --git a/src/gsiqt/qt5/QtNetwork/QtNetwork.pri b/src/gsiqt/qt5/QtNetwork/QtNetwork.pri
index e36ebef91..2602cc888 100644
--- a/src/gsiqt/qt5/QtNetwork/QtNetwork.pri
+++ b/src/gsiqt/qt5/QtNetwork/QtNetwork.pri
@@ -44,7 +44,6 @@ SOURCES += \
   $$PWD/gsiDeclQNetworkReply.cc \
   $$PWD/gsiDeclQNetworkRequest.cc \
   $$PWD/gsiDeclQNetworkSession.cc \
-  $$PWD/gsiDeclQPasswordDigestor.cc \
   $$PWD/gsiDeclQSsl.cc \
   $$PWD/gsiDeclQSslCertificate.cc \
   $$PWD/gsiDeclQSslCertificateExtension.cc \
diff --git a/testdata/python/qtbinding.py b/testdata/python/qtbinding.py
index e613fd6bb..6cf7776a0 100644
--- a/testdata/python/qtbinding.py
+++ b/testdata/python/qtbinding.py
@@ -701,7 +701,7 @@ class QtBindingTest(unittest.TestCase):
     self.assertEqual(pya.Qt_MouseButton(4).__int__(), 4)
     self.assertEqual(pya.Qt_MouseButton(4).__hash__(), 4)
     self.assertEqual(int(pya.Qt_MouseButton(4)), 4)
-    self.assertEqual(str(pya.Qt_MouseButton(4)), "MiddleButton")
+    self.assertEqual(str(pya.Qt_MouseButton(1)), "LeftButton")
     self.assertEqual(pya.Qt.MouseButton.LeftButton.to_i(), 1)
     self.assertEqual(pya.Qt_MouseButton.LeftButton.to_i(), 1)
     self.assertEqual(pya.Qt.LeftButton.to_i(), 1)
@@ -722,7 +722,7 @@ class QtBindingTest(unittest.TestCase):
     self.assertEqual(pya.Qt.MouseButton.LeftButton in h, True)
     self.assertEqual(h[pya.Qt.MouseButton.LeftButton], "left")
     self.assertEqual(h[pya.Qt.MouseButton.RightButton], "right")
-    self.assertEqual(pya.Qt.MouseButton.MiddleButton in h, False)
+    self.assertEqual(pya.Qt.MouseButton.NoButton in h, False)
 
 # run unit tests
 if __name__ == '__main__':
diff --git a/testdata/ruby/qtbinding.rb b/testdata/ruby/qtbinding.rb
index 24cb5d25a..36004d706 100644
--- a/testdata/ruby/qtbinding.rb
+++ b/testdata/ruby/qtbinding.rb
@@ -828,7 +828,7 @@ class QtBinding_TestClass < TestBase
     assert_equal(RBA::Qt::MouseButton::new(4).to_i, 4)
     assert_equal(RBA::Qt_MouseButton::new(4).to_i, 4)
     assert_equal(RBA::Qt_MouseButton::new(4).hash, 4)
-    assert_equal(RBA::Qt_MouseButton::new(4).to_s, "MiddleButton")
+    assert_equal(RBA::Qt_MouseButton::new(1).to_s, "LeftButton")
     assert_equal(RBA::Qt_MouseButton::LeftButton.to_i, 1)
     assert_equal(RBA::Qt::LeftButton.to_i, 1)
     assert_equal((RBA::Qt_MouseButton::LeftButton | RBA::Qt_MouseButton::RightButton).to_i, 3)
@@ -849,7 +849,7 @@ class QtBinding_TestClass < TestBase
     h[RBA::Qt::MouseButton::RightButton] = "right"
     assert_equal(h[RBA::Qt::MouseButton::LeftButton], "left")
     assert_equal(h[RBA::Qt::MouseButton::RightButton], "right")
-    assert_equal(h[RBA::Qt::MouseButton::MiddleButton], nil)
+    assert_equal(h[RBA::Qt::MouseButton::NoButton], nil)
 
   end