Visitar URL original
Build & generator cleanup: drop Qt5 wrapper fallbacks, switch CI to Qt 6.10, normalize macOS includes, add qmake toggles, and regenerate wrappers in CI by hjmjohnson · Pull Request #313 · MeVisLab/pythonqt · GitHub
Skip to content

Build & generator cleanup: drop Qt5 wrapper fallbacks, switch CI to Qt 6.10, normalize macOS includes, add qmake toggles, and regenerate wrappers in CI #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
usiems merged 14 commits into from
Sep 30, 2025
Merged

Build & generator cleanup: drop Qt5 wrapper fallbacks, switch CI to Qt 6.10, normalize macOS includes, add qmake toggles, and regenerate wrappers in CI #313

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eab4330
chore(qmake): add toggles to build only the generator or exclude it
jcfr Sep 27, 2025
435e230
ci(build): generate wrappers first; then build without generator
jcfr Sep 27, 2025
3f119cb
chore(build/common.prf): prefer ../generated_cpp & keep Qt5 fallbacks
jcfr Sep 26, 2025
dfeadb6
fix(generator): normalize macOS framework includes to bare Qt headers
jcfr Sep 28, 2025
f8e0cf1
ci(build.yml): Generate wrapper on macOS for both release and debug
hjmjohnson Sep 29, 2025
372f71d
chore: remove old generated files
hjmjohnson Sep 28, 2025
ce474b8
ci(build_latest.yml): Switch from Qt 6.9 to Qt 6.10
jcfr Sep 29, 2025
253e01d
chore(build/common.prf): drop Qt5 versioned wrapper fallbacks; rely o…
jcfr Sep 28, 2025
8a4a9b9
fix(generator/typesystem_core): Exclude std::string_view operator int…
jcfr Sep 29, 2025
5b18910
fix(generator/typesystem_core): Support Qt 6.10 excluding unsupported…
jcfr Sep 29, 2025
671a16c
docs(README): require per-Qt wrapper generation; add output path & qm…
jcfr Sep 29, 2025
cb1ab51
fix(generator): Define __x86_64__ to support Qt SDK on multi-lib dist…
jcfr Sep 30, 2025
ce9f365
ci: Fix generation of wrappers on rockylinux multi-lib distribution
jcfr Sep 30, 2025
d50dbe7
chore(generator): Prefer QTDIR for Qt headers/frameworks; fallback to…
jcfr Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(generator): normalize macOS framework includes to bare Qt headers 
Follow-up of 19738be ("feat(generator): discover Qt include/framework
paths dynamically; add PYTHONQT_FRAMEWORK", 2025-09-18).

On macOS, headers parsed from framework paths like:
  .../QtCore.framework/Headers/qbytearray.h
  .../QtCore.framework/Versions/A/Headers/qbytearray.h
were emitted as relative framework paths.

Update `AbstractMetaBuilder::getRelativeInclude()` to detect both layouts
and emit only the basename (e.g., `<qbytearray.h>`).
  • Loading branch information
@jcfr
jcfr committed Sep 28, 2025
commit dfeadb60e15939fd4219f0c78b570554d4609d86
17 changes: 17 additions & 0 deletions generator/abstractmetabuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#include <QtCore/QTextStream>
#include <QtCore/QVariant>
#include <QtCore/QDir>
#include <QtCore/QRegularExpression>

static QString strip_template_args(const QString &name)
{
Expand Down Expand Up @@ -416,6 +417,22 @@ AbstractMetaClass* AbstractMetaBuilder::getGlobalNamespace(const TypeEntry* type

Include AbstractMetaBuilder::getRelativeInclude(const QString& path)
{
#ifdef Q_OS_MACOS
// If the parsed header lives inside a macOS framework bundle, emit just the
// bare header name (e.g., "qbytearray.h") so generators will produce <...>.
//
// Match both:
// .../QtCore.framework/Headers/...
// .../QtCore.framework/Versions/<X>/Headers/...
static const QRegularExpression fwHeadersRe(
QStringLiteral(R"(\.framework/(Versions/[^/]+/)?Headers/)")
);
if (fwHeadersRe.match(path).hasMatch()) {
const QString base = QFileInfo(path).fileName(); // e.g., "qbytearray.h"
return Include(Include::IncludePath, base); // choose <> style
}
#endif

QString bestRelativePath;
int bestNumDirectories = 0;
// find the shortest relative path relative to all given include directories
Expand Down
Loading