Fix graphical effects issues on Linux

After switching to Qbs (and building statically to avoid [1]), we ran into [2]. We now have a workaround for that, so we can finally release on Linux again. Closes #71. [1] probonopd/linuxdeployqt#280 [2] https://bugreports.qt.io/browse/QBS-1409
mitchcurtis · Nov 2, 2018 · 3cd3dbf · 3cd3dbf
1 parent 4a9681d
commit 3cd3dbf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/app/app.qbs b/app/app.qbs
@@ -12,6 +12,12 @@ QtGuiApplication {
     Depends { name: "lib" }
     // Provides support for Apple Interface Builder - aka asset catalogs.
     Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
+    // Workaround for static builds until https://bugreports.qt.io/browse/QBS-1409 is fixed
+    Depends {
+        name: "Qt"
+        condition: Qt.core.staticBuild && qbs.targetOS.contains("linux")
+        submodules: ["qxcb-egl-integration"]
+    }
 
     // Additional import path used to resolve QML modules in Qt Creator's code model
     property pathList qmlImportPaths: []

diff --git a/tests/auto/test-app.qbs b/tests/auto/test-app.qbs
@@ -9,6 +9,12 @@ QtGuiApplication {
     Depends { name: "Qt.test" }
     Depends { name: "Qt.widgets" }
     Depends { name: "lib" }
+    // Workaround for static builds until https://bugreports.qt.io/browse/QBS-1409 is fixed
+    Depends {
+        name: "Qt"
+        condition: Qt.core.staticBuild && qbs.targetOS.contains("linux")
+        submodules: ["qxcb-egl-integration"]
+    }
 
     // Additional import path used to resolve QML modules in Qt Creator's code model
     property pathList qmlImportPaths: []

diff --git a/tests/manual/memory-usage/memory-usage.qbs b/tests/manual/memory-usage/memory-usage.qbs
@@ -11,6 +11,12 @@ Project {
         Depends { name: "Qt.test" }
         Depends { name: "Qt.widgets" }
         Depends { name: "lib" }
+        // Workaround for static builds until https://bugreports.qt.io/browse/QBS-1409 is fixed
+        Depends {
+            name: "Qt"
+            condition: Qt.core.staticBuild && qbs.targetOS.contains("linux")
+            submodules: ["qxcb-egl-integration"]
+        }
 
         // Additional import path used to resolve QML modules in Qt Creator's code model
         property pathList qmlImportPaths: []

diff --git a/tests/manual/screenshots/screenshots.qbs b/tests/manual/screenshots/screenshots.qbs
@@ -9,6 +9,12 @@ QtGuiApplication {
     Depends { name: "Qt.test" }
     Depends { name: "Qt.widgets" }
     Depends { name: "lib" }
+    // Workaround for static builds until https://bugreports.qt.io/browse/QBS-1409 is fixed
+    Depends {
+        name: "Qt"
+        condition: Qt.core.staticBuild && qbs.targetOS.contains("linux")
+        submodules: ["qxcb-egl-integration"]
+    }
 
     // Additional import path used to resolve QML modules in Qt Creator's code model
     property pathList qmlImportPaths: []