diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml index 9e7a325ae..e1a05b046 100644 --- a/.github/workflows/build_latest.yml +++ b/.github/workflows/build_latest.yml @@ -5,7 +5,7 @@ on: branches: - master pull_request: - + defaults: run: shell: bash @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu', 'windows'] - qt-version: [ '5.12.*', '5.15.*', '6.5.*' ] + qt-version: [ '5.12.*', '5.15.*', '6.7.*' ] python-version: [ '3.12' ] runs-on: ${{ matrix.os }}-latest steps: @@ -30,10 +30,10 @@ jobs: - name: Install Qt ${{matrix.qt-version}} uses: jurplel/install-qt-action@v4 with: - version: ${{ matrix.qt-version }} + # 6.7.* currently does not work with ubuntu with this action + version: ${{ matrix.os == 'ubuntu' && matrix.qt-version == '6.7.*' && '6.6.*' || matrix.qt-version }} modules: ${{startsWith(matrix.qt-version, '6') && 'qt5compat qtscxml qtpositioning qtwebchannel qtmultimedia qtwebengine' || '' }} arch: ${{ matrix.os == 'ubuntu' && 'gcc_64' || (startsWith(matrix.qt-version, '5.12') && 'win64_msvc2017_64' || 'win64_msvc2019_64') }} - archives: "qtmultimedia qtbase qttools qtdeclarative ${{ matrix.os == 'windows' && 'qtwinextras' || 'qtlinuxextras qtwayland icu' }}" - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v5 @@ -117,4 +117,3 @@ jobs: set PYTHONASYNCIODEBUG=1 set PYTHONWARNINGS=error nmake && nmake check "TESTARGS=-platform offscreen" - diff --git a/generator/typesystem_core.xml b/generator/typesystem_core.xml index 7ab63ea25..321ed923d 100644 --- a/generator/typesystem_core.xml +++ b/generator/typesystem_core.xml @@ -1,6 +1,6 @@ - + @@ -14,7 +14,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -718,6 +718,7 @@ + @@ -744,7 +745,7 @@ - + @@ -778,7 +779,7 @@ - + @@ -909,7 +910,7 @@ - + @@ -983,7 +984,7 @@ public: - + @@ -999,18 +1000,18 @@ public: - - + + - - + + - + @@ -1088,11 +1089,15 @@ public: - + + +public: + const static int DefaultTwoDigitBaseYear = QLocale::DefaultTwoDigitBaseYear; + @@ -1109,7 +1114,7 @@ public: - + @@ -1237,7 +1242,7 @@ public: - + PyObject* data(QByteArray* b) { return PyBytes_FromStringAndSize(b->data(), b->size()); @@ -1436,7 +1441,7 @@ public: - + @@ -1621,14 +1626,14 @@ public: - + - + @@ -1654,7 +1659,7 @@ public: - + @@ -1701,28 +1706,28 @@ public: - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + QString readQString(QDataStream* d) { QString r; (*d) >> r; return r; } @@ -1856,38 +1861,38 @@ public: - - + + - + - + - + - + - - + + - - + + - + - + - + @@ -1921,8 +1926,8 @@ public: - - + + @@ -1967,14 +1972,14 @@ public: - + - + @@ -1985,31 +1990,31 @@ public: - + - - - - + + + + - - - - - - + + + + + + QByteArray readByteArray(QCborStreamReader* theWrappedObject) { auto result = theWrappedObject->readByteArray(); return result.status == QCborStreamReader::Ok ? result.data : QByteArray(); } - + QString readString(QCborStreamReader* theWrappedObject) { auto result = theWrappedObject->readString(); return result.status == QCborStreamReader::Ok ? result.data : QString(); } - + qint64 toTag(QCborStreamReader* theWrappedObject) const { return static_cast<qint64>(theWrappedObject->toTag()); } @@ -2023,7 +2028,7 @@ public: QCborValue* new_QCborValue(qint64 tag, const QCborValue& taggedValue) { return new QCborValue(QCborTag(tag), taggedValue); } - + qint64 tag(QCborValue* theWrappedObject, qint64 defaultValue) const { return static_cast<qint64>(theWrappedObject->tag(QCborTag(defaultValue))); } @@ -2281,7 +2286,7 @@ public: - + diff --git a/src/PythonQtDoc.h b/src/PythonQtDoc.h index 7adfe8d48..e53b9e901 100644 --- a/src/PythonQtDoc.h +++ b/src/PythonQtDoc.h @@ -133,8 +133,8 @@ Qt framework. - Python 2 (>= Python 2.7) - Python 3 (>= Python 3.6) - Qt 4.x (Qt 4.7 and Qt 4.8 recommended) (not in the master branch, see below) - - Qt 5.x (Tested with Qt 5.0, 5.3, 5.4, 5.6, 5.11, 5.12 and 5.15) - - Qt 6.x (Tested with Qt 6.5 and 6.6) - support may not be complete, support for optional modules may be added as needed + - Qt 5.x (Tested with Qt 5.6, 5.11, 5.12 and 5.15) + - Qt 6.x (Tested with Qt 6.5 - 6.7) - support may not be complete, support for optional modules may be added as needed The last working Qt4 version is available at svn branches/Qt4LastWorkingVersion or you can download the PythonQt 3.0 release. The current git master branch no longer supports Qt4, since we started to make use of some Qt5-only features.