Skip to content

Find QuickPrivate component for WPE Qt API#62564

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
tusooa:eng/Configure-with-ENABLE_WPE_QT_API-ON-fails-without-finding-Qt-QuickPrivate
Apr 13, 2026
Merged

Find QuickPrivate component for WPE Qt API#62564
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
tusooa:eng/Configure-with-ENABLE_WPE_QT_API-ON-fails-without-finding-Qt-QuickPrivate

Conversation

@tusooa
Copy link
Copy Markdown
Contributor

@tusooa tusooa commented Apr 12, 2026

6998260

Find QuickPrivate component for WPE Qt API

https://bugs.webkit.org/show_bug.cgi?id=312064

Reviewed by Claudio Saavedra.

In newer versions of Qt6, Qt6Quick module no longer includes
the Qt6QuickPrivate, so we need to manually find the Qt6QuickPrivate
module. Compatibility kept for older versions by only requesting to
find Qt6QuickPrivate when the Qt::QuickPrivate is not yet available by
just finding Qt6Quick.

Configure-time only change, no runtime tests needed.

* Source/cmake/OptionsWPE.cmake:

Canonical link: https://commits.webkit.org/311087@main

f4b51a9

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug 🧪 wpe-wk2 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
🧪 ios-wk2-wpt 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🛠 🧪 jsc ✅ 🧪 api-ios ✅ 🛠 gtk
✅ 🛠 🧪 jsc-debug-arm64 ✅ 🧪 mac-wk2 🧪 gtk-wk2
✅ 🛠 vision 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 tv ✅ 🧪 jsc-armv7-tests
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@tusooa tusooa requested a review from a team as a code owner April 12, 2026 00:04
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 12, 2026
@csaavedra
Copy link
Copy Markdown
Member

It looks like the WebKit SDK doesn't have that package installed. You'll need to fix that too separately before we can land this.

That being said, why is this needed? If the SDK doesn't have the private package and it builds, I don't understand why this dependence is needed. But I'm not familiar with Qt at all, so I would appreciate your insight.

@tusooa tusooa force-pushed the eng/Configure-with-ENABLE_WPE_QT_API-ON-fails-without-finding-Qt-QuickPrivate branch from 1398c49 to 71051ab Compare April 13, 2026 04:19
@tusooa
Copy link
Copy Markdown
Contributor Author

tusooa commented Apr 13, 2026

It looks like the WebKit SDK doesn't have that package installed. You'll need to fix that too separately before we can land this.

That being said, why is this needed? If the SDK doesn't have the private package and it builds, I don't understand why this dependence is needed. But I'm not familiar with Qt at all, so I would appreciate your insight.

I changed the relevant configure code to find Qt6QuickPrivate only when Qt6Quick module does not provide the target Qt::QuickPrivate.

Copy link
Copy Markdown
Member

@csaavedra csaavedra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make this version dependant instead or at least document in the comment since which version this is needed? This way we can remove the check once we start depending on a newer version.

@tusooa tusooa force-pushed the eng/Configure-with-ENABLE_WPE_QT_API-ON-fails-without-finding-Qt-QuickPrivate branch from 71051ab to f4b51a9 Compare April 13, 2026 13:10
@tusooa
Copy link
Copy Markdown
Contributor Author

tusooa commented Apr 13, 2026

It looks like the WebKit SDK doesn't have that package installed. You'll need to fix that too separately before we can land this.

That being said, why is this needed? If the SDK doesn't have the private package and it builds, I don't understand why this dependence is needed. But I'm not familiar with Qt at all, so I would appreciate your insight.

I changed the relevant configure code to find Qt6QuickPrivate only when Qt6Quick module does not provide the target Qt::QuickPrivate.

Can we make this version dependant instead or at least document in the comment since which version this is needed? This way we can remove the check once we start depending on a newer version.

Yes, after investigating, this change is introduced in Qt 6.9.

@csaavedra csaavedra added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Apr 13, 2026
https://bugs.webkit.org/show_bug.cgi?id=312064

Reviewed by Claudio Saavedra.

In newer versions of Qt6, Qt6Quick module no longer includes
the Qt6QuickPrivate, so we need to manually find the Qt6QuickPrivate
module. Compatibility kept for older versions by only requesting to
find Qt6QuickPrivate when the Qt::QuickPrivate is not yet available by
just finding Qt6Quick.

Configure-time only change, no runtime tests needed.

* Source/cmake/OptionsWPE.cmake:

Canonical link: https://commits.webkit.org/311087@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Configure-with-ENABLE_WPE_QT_API-ON-fails-without-finding-Qt-QuickPrivate branch from f4b51a9 to 6998260 Compare April 13, 2026 14:19
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 311087@main (6998260): https://commits.webkit.org/311087@main

Reviewed commits have been landed. Closing PR #62564 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 6998260 into WebKit:main Apr 13, 2026
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 13, 2026
@aperezdc aperezdc added the GLib Suggested Backport - 2.52 Suggest this merge request be backported to the webkitglib/2.52 stable branch label Apr 13, 2026
@aperezdc
Copy link
Copy Markdown
Contributor

Backported into webkitglib/2.52 as commit 06b34b9

(...and included in the 2.52.2 release, published a few minutes ago)

@aperezdc aperezdc removed the GLib Suggested Backport - 2.52 Suggest this merge request be backported to the webkitglib/2.52 stable branch label Apr 13, 2026
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.

6 participants