Update upstream#1
Merged
Merged
Conversation
and other nice options like PYTHONMALLOC=debug_malloc (useful for ASan) and more rigorous warnings handling
…delete operators and destructors
- needed for QLibraryInfo.version()
* Parse PYTHONQTALL_CONFIG value * Add test for env var PYTHONQTALL_CONFIG * MSVC2019 for Qt5.15 test
but I don't know why, since the method should simply work (like the other find variant). And it was reported that the method was previously (before Qt6) created, even though it should have been suppressed.
Migrate to `QT_ROOT_DIR`, remove obsolete `PATH` handling
- use Qt 6.7 for Winodws CI build, 6.6 for ubuntu (jurplel/install-qt-action has a problem with that version) - fixes MeVisLab#215
…nition This was especially problematic if the line ended with the comment, since then the next line would be added, too, even though the current one didn't end with a '\'
This prevented QT6_DECL_NEW_OVERLOAD_TAIL from being expanded correctly
they don't have an implementation. Often the friend definitions are the only definition there is, and we translate these definitions (currently always operators) to wrapper members then.
(this fixes some parser errors)
Bumps [hendrikmuhs/ccache-action](https://github.com/hendrikmuhs/ccache-action) from 1.2.18 to 1.2.19. - [Release notes](https://github.com/hendrikmuhs/ccache-action/releases) - [Commits](hendrikmuhs/ccache-action@v1.2.18...v1.2.19) --- updated-dependencies: - dependency-name: hendrikmuhs/ccache-action dependency-version: 1.2.19 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 6. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v6) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
This changes the initialization of `m_type_flags` to use `TypeFlag::NoTypeFlags`
instead of 0. This resolves a deprecation warning related to the QFlags
default constructor in Qt 5.15.2.
The warning fixed is:
```
/path/to/PythonQt/generator/typesystem.h:812:11: warning: ‘constexpr QFlags<T>::QFlags(QFlags<T>::Zero) [with Enum = ComplexTypeEntry::TypeFlag; QFlags<T>::Zero = int QFlags<ComplexTypeEntry::TypeFlag>::Private::*]’ is deprecated: Use default constructor instead [-Wdeprecated-declarations]
812 | m_type_flags(0)
| ^~~~~~~~~~~~~~~
In file included from /path/to/Qt/5.15.2/gcc_64/include/QtCore/qglobal.h:1304,
from /path/to/Qt/5.15.2/gcc_64/include/QtCore/qalgorithms.h:43,
from /path/to/Qt/5.15.2/gcc_64/include/QtCore/qlist.h:43,
from /path/to/Qt/5.15.2/gcc_64/include/QtCore/QList:1,
from /path/to/PythonQt/generator/parser/codemodel_fwd.h:46,
from /path/to/PythonQt/generator/parser/codemodel.h:46,
from /path/to/PythonQt/generator/abstractmetabuilder.h:45,
from /path/to/PythonQt/generator/abstractmetabuilder.cpp:42:
/path/to/Qt/5.15.2/gcc_64/include/QtCore/qflags.h:123:80: note: declared here
123 | QT_DEPRECATED_X("Use default constructor instead") Q_DECL_CONSTEXPR inline QFlags(Zero) noexcept : i(0) {}
| ^~~~~~
```
This changes the usage of the deprecated global `endl` with `Qt::endl` for compatibility with Qt 5.15.2 and above. The approach ensures that `Qt::endl` is used consistently across all versions of Qt by defining a namespaced alias for Qt versions below 5.14.0. This follows up on the approach introduced in d11fc4f ("Qt6: QTextStream compatibility (PR-120)", 2023-10-05) by explicitly using `Qt::endl` everywhere and by flipping the logic to have `Qt::endl` defined for Qt < 5.14.0 Warnings addressed: ``` /path/to/PythonQt/generator/typesystem.cpp: In function ‘QString formattedCodeHelper(QTextStream&, Indentor&, QStringList&)’: /path/to/PythonQt/generator/typesystem.cpp:1900:38: warning: ‘QTextStream& QTextStreamFunctions::endl(QTextStream&)’ is deprecated: Use Qt::endl [-Wdeprecated-declarations] 1900 | s << indentor << line << endl; | ^~~~ In file included from /path/to/Qt/5.15.2/gcc_64/include/QtCore/qdebug.h:49, from /path/to/Qt/5.15.2/gcc_64/include/QtCore/QDebug:1, from /path/to/PythonQt/generator/typesystem.h:49, from /path/to/PythonQt/generator/typesystem.cpp:42: /path/to/Qt/5.15.2/gcc_64/include/QtCore/qtextstream.h:293:75: note: declared here 293 | Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::endl") QTextStream &endl(QTextStream &s); | ^~~~ ```
This updates `build_all.txt` to reference dependent typesystem files as Qt resources and adds the missing `typesystem_uitools.xml` entry. This change removes the need to copy the `typesystem_*.xml` files alongside the generator executable or start the executable from the generator source directory.
This allows checking that the fix integrated in the previous commit effectively works. Since by default the generator output the generated files in the parent directory, the output directory is explicitly specified to be the current directory.
Ensure that typesystem files are loaded from the Qt resources only if not found in the specified file path. Suggested-by: Uwe Siems <uwe.siems@mevis.de>
- drop the legacy QtXml reader/handler stack in favor of `QXmlStreamReader` - rewrite the typesystem Handler to drive the stream reader directly and wrap `QXmlStreamAttributes` - update attribute helpers and error reporting to match the new streaming API - open typesystem files with QText mode and surface parse failures via `ReportHandler`
…r.pri Suggested-by: Uwe Siems <uwe.siems@mevis.de>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v4...v5) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
- couldn't get it to work due to permission issues
* Add comments to Python structures to avoid wrapping on a single line when formatting with clang-format
- exclude unwanted directories by adding disabling .clang-format files - also add a hooks for line endings, trailing spaces and case/merge conflicts
- probably a problem with aqtinstall, see miurahr/aqtinstall#803
- check if 6.10.1 works again
updates: - [github.com/pre-commit/mirrors-clang-format: v21.1.5 → v21.1.6](pre-commit/mirrors-clang-format@v21.1.5...v21.1.6)
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [hendrikmuhs/ccache-action](https://github.com/hendrikmuhs/ccache-action) from 1.2.19 to 1.2.20. - [Release notes](https://github.com/hendrikmuhs/ccache-action/releases) - [Commits](hendrikmuhs/ccache-action@v1.2.19...v1.2.20) --- updated-dependencies: - dependency-name: hendrikmuhs/ccache-action dependency-version: 1.2.20 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
updates: - [github.com/pre-commit/mirrors-clang-format: v21.1.6 → v21.1.7](pre-commit/mirrors-clang-format@v21.1.6...v21.1.7)
updates: - [github.com/pre-commit/mirrors-clang-format: v21.1.7 → v21.1.8](pre-commit/mirrors-clang-format@v21.1.7...v21.1.8)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
parse the string version instead
This is release v4.0.1 of MeVisLab/pythonqt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.