luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backward compatibility to Qt 5.12.8 and 5.12.11, fixed some test fails for Qt4

This commit is contained in:
Matthias Koefferlein 2023-03-26 22:47:56 +02:00
parent 0cae15c6fa
commit acd9d6b8c5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mkqtdecl5/mkqtdecl.conf
View File

@ -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

1
src/gsiqt/qt5/QtNetwork/QtNetwork.pri
View File

@ -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 \

4
testdata/python/qtbinding.py vendored
View File

@ -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__':

4
testdata/ruby/qtbinding.rb vendored
View File

@ -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