Refactor: Fix Qt 6 macro conflicts in Chromium wrapper#8
Merged
Conversation
pplupo
changed the title
Signed-off-by: Peter P. Lupo <pplupo@gmail.com>
* Linker Error Resolved: Fixed the final build failure by removing the invalid OfficeUtils target from the editors_helper linker dependencies (as it is already compiled directly into the kernel static library). * qascprinter.cpp: Fixed a compilation error by replacing an incorrect Qt 6 macro check and migrating the removed QPrinter::pageRect() method to use pageLayout().fullRectPixels(). * gtkprintdialog.cpp: Replaced deprecated setPaperName() and setPaperSize() usages with setPageSize(). * qmultimedia.h: Included the missing <QtGlobal> header to ensure compilation flags evaluate properly. Signed-off-by: Peter P. Lupo <pplupo@gmail.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
rikled
approved these changes
Jun 30, 2026
rikled
left a comment
rikled
left a comment
Member
There was a problem hiding this comment.
already approved in Euro-Office/DesktopEditors#37
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
2 participants
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.
Overview
This PR updates the Chromium Embedded Framework (CEF) wrapper layer to ensure compatibility with Qt 6.11.
Changes
signals:andpublic slots:with their macro-safe equivalents (Q_SIGNALS:andQ_SLOTS:).QT_NO_KEYWORDSflag. The CEF wrapper classes that do not inherit fromQObjectwere triggering compilation failures because the C++ compiler could not resolve the naked Qt macros.Testing
QT_NO_KEYWORDSdefined.