From 9e1186991c4d857cbf765d4f7815a5ffcce0e613 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 9 Oct 2024 13:50:07 +0200 Subject: [PATCH 1/2] Use Qt xcb platform by default CURA-12054 It is now a fact that Cura doesn't work properly with native Qt/Wayland integration. However, on recent Ubuntu versions Wayland is now used by default. So we now force using the xcb platform unless otherwise specified, which should have no impact on older platforms but work better on new ones. --- packaging/AppImage/AppRun | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index 369ce54c6c2..1eb883d52aa 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -9,6 +9,7 @@ export QML2_IMPORT_PATH="$scriptdir/qt/qml" export QT_QPA_FONTDIR=/usr/share/fonts export QT_QPA_PLATFORMTHEME=xdgdesktopportal export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb +export QT_QPA_PLATFORM=xcb # Use the openssl.cnf packaged in the AppImage export OPENSSL_CONF="$scriptdir/openssl.cnf" From 55feaaf8b1af49a3e92cc5b9de8c2ee5decd8b93 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 9 Oct 2024 16:33:41 +0200 Subject: [PATCH 2/2] Set the variable in the proper file --- packaging/AppImage-builder/AppImageBuilder.yml.jinja | 1 + packaging/AppImage/AppRun | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/AppImage-builder/AppImageBuilder.yml.jinja b/packaging/AppImage-builder/AppImageBuilder.yml.jinja index 9090a5f209d..c6e7a7123a3 100644 --- a/packaging/AppImage-builder/AppImageBuilder.yml.jinja +++ b/packaging/AppImage-builder/AppImageBuilder.yml.jinja @@ -47,6 +47,7 @@ AppDir: QT_PLUGIN_PATH: "$APPDIR/qt/plugins" QML2_IMPORT_PATH: "$APPDIR/qt/qml" QT_QPA_PLATFORMTHEME: xdgdesktopportal + QT_QPA_PLATFORM: xcb GDK_PIXBUF_MODULEDIR: $APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders GDK_PIXBUF_MODULE_FILE: $APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache path_mappings: diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index 1eb883d52aa..369ce54c6c2 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -9,7 +9,6 @@ export QML2_IMPORT_PATH="$scriptdir/qt/qml" export QT_QPA_FONTDIR=/usr/share/fonts export QT_QPA_PLATFORMTHEME=xdgdesktopportal export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb -export QT_QPA_PLATFORM=xcb # Use the openssl.cnf packaged in the AppImage export OPENSSL_CONF="$scriptdir/openssl.cnf"