From 27d770b0bed12fb6b42b4e1a94b549ac559985d2 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Thu, 11 Mar 2021 03:28:17 +0100
Subject: [bug] avoid style plugins mixing up and crashing gui

forcing a style override looks like a good workaround to avoid system qt
plugins mixing up with the libs in the snap.

- Resolves: #458
---
 branding/templates/snap/snapcraft-template.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'branding/templates/snap')

diff --git a/branding/templates/snap/snapcraft-template.yaml b/branding/templates/snap/snapcraft-template.yaml
index 4a6bd89..6df3d6d 100644
--- a/branding/templates/snap/snapcraft-template.yaml
+++ b/branding/templates/snap/snapcraft-template.yaml
@@ -64,7 +64,6 @@ parts:
       - qml-module-qtquick-controls
       - qml-module-qtquick-dialogs
       - qml-module-qtquick-extras
-      - qml-module-qt-labs-qmlmodels
       - qml-module-qt-labs-platform
     after: [desktop-qt5]
 
@@ -94,12 +93,12 @@ parts:
       - libqt5svg5
       - libqt5qml5
       - libqt5quick5
+      - qt5-style-plugins
       - qml-module-qtquick2
       - qml-module-qtquick-controls
       - qml-module-qtquick-dialogs
       - qml-module-qtquick-extras
       - qml-module-qt-labs-platform
-      - qml-module-qt-labs-qmlmodels
       - try: [appmenu-qt5] # not available on core18
 
 apps:
@@ -121,8 +120,9 @@ apps:
       LD_LIBRARY_PATH:
         $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$LD_LIBRARY_PATH
       QML2_IMPORT_PATH:
-        $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/qml
+        $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/qml:$SNAP/usr/lib/x86_64-linux-gnu/qt5/qml
       # debug -------------
       #QT_DEBUG_PLUGINS: 1
       SNAP_DESKTOP_DEBUG: 1
+      QT_STYLE_OVERRIDE: Fusion
       # debug -------------
-- 
cgit v1.2.3