diff options
| -rwxr-xr-x | examples/network/fortuneserver.py | 7 | ||||
| -rw-r--r-- | missing_bindings.py | 6 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | sources/shiboken2/generator/main.cpp | 3 |
4 files changed, 7 insertions, 10 deletions
diff --git a/examples/network/fortuneserver.py b/examples/network/fortuneserver.py index 852aabafe..692c5bd32 100755 --- a/examples/network/fortuneserver.py +++ b/examples/network/fortuneserver.py @@ -97,13 +97,6 @@ class Server(QtWidgets.QDialog): out.writeUInt16(0) fortune = self.fortunes[random.randint(0, len(self.fortunes) - 1)] - try: - # Python v3. - fortune = bytes(fortune, encoding='ascii') - except: - # Python v2. - pass - out.writeString(fortune) out.device().seek(0) out.writeUInt16(block.size() - 2) diff --git a/missing_bindings.py b/missing_bindings.py index 2d9267455..3fa97f0b5 100644 --- a/missing_bindings.py +++ b/missing_bindings.py @@ -216,7 +216,7 @@ qt_documentation_website_prefixes['5.6'] = 'http://doc.qt.io/qt-5.6/' qt_documentation_website_prefixes['5.8'] = 'http://doc.qt.io/qt-5.8/' qt_documentation_website_prefixes['5.9'] = 'http://doc.qt.io/qt-5.9/' qt_documentation_website_prefixes['5.10'] = 'http://doc.qt.io/qt-5.10/' -qt_documentation_website_prefixes['5.11'] = 'http://doc-snapshots.qt.io/qt5-5.11/' +qt_documentation_website_prefixes['5.11'] = 'http://doc.qt.io/qt-5/' qt_documentation_website_prefixes['dev'] = 'http://doc-snapshots.qt.io/qt5-dev/' @@ -305,8 +305,8 @@ def log(*pargs, **kw): log('PySide2 bindings for Qt {}'.format(args.version), style='heading1') -log("""Using Qt version {} documentation to find public API Qt types and test " - "if the types are present in the PySide2 package.""".format(args.version)) +log("""Using Qt version {} documentation to find public API Qt types and test +if the types are present in the PySide2 package.""".format(args.version)) log("""Results are usually stored at https://wiki.qt.io/PySide2_Missing_Bindings @@ -248,6 +248,7 @@ setup( description = ("Python bindings for the Qt cross-platform application and " "UI framework"), long_description = README + "\n\n" + CHANGES, + long_description_content_type = 'text/markdown', classifiers = [ 'Development Status :: 5 - Production/Stable', 'Environment :: Console', diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp index bcfcc5c77..9c3d7275b 100644 --- a/sources/shiboken2/generator/main.cpp +++ b/sources/shiboken2/generator/main.cpp @@ -397,6 +397,9 @@ static void parseIncludePathOption(const QString &option, HeaderType headerType, int main(int argc, char *argv[]) { + // PYSIDE-757: Request a deterministic ordering of QHash in the code model + // and type system. + qSetGlobalQHashSeed(0); QElapsedTimer timer; timer.start(); // needed by qxmlpatterns |