Skip to content

Wayland fixes for Qt5 #288

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

Closed
spham-amzn wants to merge 1 commit into from
+45 −8
Closed

Wayland fixes for Qt5 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions package-system/Qt/Platform/Linux/QtPlugin_linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins
FILES
${QT_PATH}/plugins/platforms/libqminimal.so
${QT_PATH}/plugins/platforms/libqxcb.so
${QT_PATH}/plugins/platforms/libqwayland-egl.so
${QT_PATH}/plugins/platforms/libqwayland-generic.so
OUTPUT_SUBDIRECTORY platforms
)

Expand All @@ -60,5 +62,39 @@ ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins
OUTPUT_SUBDIRECTORY xcbglintegrations
)

ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins
FILES
${QT_PATH}/plugins/wayland-decoration-client/libbradient.so
OUTPUT_SUBDIRECTORY wayland-decoration-client
)

ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins
FILES
${QT_PATH}/plugins/wayland-graphics-integration-client/libdmabuf-server.so
${QT_PATH}/plugins/wayland-graphics-integration-client/libdrm-egl-server.so
${QT_PATH}/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so
${QT_PATH}/plugins/wayland-graphics-integration-client/libshm-emulation-server.so
${QT_PATH}/plugins/wayland-graphics-integration-client/libvulkan-server.so
OUTPUT_SUBDIRECTORY wayland-graphics-integration-client
)

ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins
FILES
${QT_PATH}/plugins/wayland-shell-integration/libfullscreen-shell-v1.so
${QT_PATH}/plugins/wayland-shell-integration/libivi-shell.so
${QT_PATH}/plugins/wayland-shell-integration/libwl-shell.so
${QT_PATH}/plugins/wayland-shell-integration/libxdg-shell.so
${QT_PATH}/plugins/wayland-shell-integration/libxdg-shell-v5.so
${QT_PATH}/plugins/wayland-shell-integration/libxdg-shell-v6.so
OUTPUT_SUBDIRECTORY wayland-shell-integration
)

ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins
FILES
${QT_PATH}/plugins/platformthemes/libqxdgdesktopportal.so
OUTPUT_SUBDIRECTORY platformthemes
)

ly_add_dependencies(3rdParty::Qt::Widgets::Plugins Qt5::DBus)
ly_add_dependencies(3rdParty::Qt::Widgets::Plugins Qt5::XcbQpa)
ly_add_dependencies(3rdParty::Qt::Widgets::Plugins Qt5::WaylandClient)
1 change: 1 addition & 0 deletions package-system/Qt/Platform/Linux/Qt_linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set(QT_LIB_PATH ${QT_PATH}/lib)
list(APPEND QT5_COMPONENTS
DBus
XcbQpa
WaylandClient
)

function(ly_qt_configuration_mapping in_config out_config)
Expand Down
4 changes: 2 additions & 2 deletions package-system/Qt/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"Linux": {
"Linux": {
"package_version": "5.15.2-rev10",
"package_version": "5.15.2-rev11",
"patch_file": "qt-linux.patch",
"depends_on_packages": [
["OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", ""],
Expand All @@ -68,7 +68,7 @@
]
},
"Linux-aarch64": {
"package_version": "5.15.2-rev10",
"package_version": "5.15.2-rev11",
"patch_file": "qt-linux.patch",
"depends_on_packages": [
["OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", ""],
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_linux-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64",
"pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --clean",
"python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean",
"qt-5.15.2-rev10-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean",
"qt-5.15.2-rev11-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean",
"sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean",
"SPIRVCross-1.3.275.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean",
"SQLite-3.37.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux-aarch64 --clean",
Expand Down Expand Up @@ -75,7 +75,7 @@
"poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri-linux-aarch64",
"pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64",
"python-3.10.13-rev2-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
"qt-5.15.2-rev10-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64",
"qt-5.15.2-rev11-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64",
"sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64",
"SPIRVCross-1.3.275.0-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64",
"SQLite-3.37.2-rev1-linux-aarch64": "package-system/sqlite/temp/SQLite-linux-aarch64",
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"python-3.10.13-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean",
"python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean",
"mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
"qt-5.15.2-rev10-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean",
"qt-5.15.2-rev10-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --package-root ../../package-system/Qt/temp",
"qt-5.15.2-rev11-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean",
"qt-5.15.2-rev11-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --package-root ../../package-system/Qt/temp",
"zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
"lz4-1.9.4-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/lz4 --platform-name Linux --package-root ../../package-system/lz4/temp --clean",
"expat-2.4.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Linux --package-root ../../package-system/expat/temp --clean",
Expand Down Expand Up @@ -98,8 +98,8 @@
"unwind-1.2.1-linux": "package-system/unwind-linux",
"SQLite-3.37.2-rev1-linux": "package-system/SQLite-linux",
"xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
"qt-5.15.2-rev10-linux": "package-system/Qt/temp/qt-linux",
"qt-5.15.2-rev10-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64",
"qt-5.15.2-rev11-linux": "package-system/Qt/temp/qt-linux",
"qt-5.15.2-rev11-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64",
"zlib-1.2.11-rev5-linux": "package-system/zlib-linux",
"lz4-1.9.4-rev2-linux": "package-system/lz4/temp/lz4-linux",
"expat-2.4.2-rev2-linux": "package-system/expat/temp/expat-linux",
Expand Down
Loading