Skip to content
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.

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

Qt 6.7 temp fix, change to Qt needed to fully fix #921

Merged
merged 4 commits into from
Feb 8, 2024

Conversation

mattkdab
Copy link
Member

@mattkdab mattkdab commented Jan 16, 2024

This change enables building with Qt 6.7, but assuming this Qt patch is approved, the following will no longer be needed:

+ #if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
    MO_ADD_METAOBJECT1(QDeferredDeleteEvent, QEvent);
    MO_ADD_PROPERTY_RO(QDeferredDeleteEvent, loopLevel);
+ #endif

So while this works for now, it should not be the real final solution.

Eventually fixes #918

@mattkdab mattkdab marked this pull request as draft January 16, 2024 21:11
@CLAassistant
Copy link

CLAassistant commented Jan 16, 2024

CLA assistant check
All committers have signed the CLA.

@winterz
Copy link
Member

winterz commented Jan 16, 2024

this is hard to verify until we add qt 6.7 to the CI matrix

@dantti

@dantti
Copy link
Member

dantti commented Jan 17, 2024

With the current 6.7 beta that Qt company released it still fails:
https://github.com/KDAB/GammaRay/actions/runs/7550206827/job/20555459025

@mattkdab
Copy link
Member Author

If the patch at https://codereview.qt-project.org/c/qt/qtbase/+/531661 is merged, it should enable the reversion of this part of the change:

+ #if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
    MO_ADD_METAOBJECT1(QDeferredDeleteEvent, QEvent);
    MO_ADD_PROPERTY_RO(QDeferredDeleteEvent, loopLevel);
+ #endif

@redstrate has already tested this

@mattkdab
Copy link
Member Author

With the current 6.7 beta that Qt company released it still fails: https://github.com/KDAB/GammaRay/actions/runs/7550206827/job/20555459025

It should pass for this PR only at this point

@mattkdab mattkdab marked this pull request as ready for review February 7, 2024 00:42
@mattkdab mattkdab merged commit 4d0974f into KDAB:master Feb 8, 2024
14 checks passed
@wineee wineee mentioned this pull request Apr 12, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Building against Qt 6.7 fails
4 participants