Merge pull request #311 from ales-erjavec/fixes/qt-plugins-search-path

[FIX] application.py: Fix qt plugins search logic error
biolab · Oct 3, 2024 · bad9db8 · bad9db8
2 parents 35d517f + 1b341a6
commit bad9db8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/run-tests-workflow.yml b/.github/workflows/run-tests-workflow.yml
@@ -152,6 +152,19 @@ jobs:
           XVFBARGS: "-screen 0 1280x1024x24"
         run: catchsegv xvfb-run -a -s "$XVFBARGS" pytest -v --cov=orangecanvas --cov-report=xml
 
+      - name: Test non-ascii install path
+        if: ${{ startsWith(runner.os, 'Linux') }}
+        env:
+          TEST_ENV: ${{ matrix.test-env }}
+          XVFBARGS: "-screen 0 1280x1024x24"
+        run: |
+          NAME="ščž ćžđ"
+          python -m venv "$NAME"
+          . "$NAME"/bin/activate
+          pip install $TEST_ENV ./
+          cd ..
+          catchsegv xvfb-run -a -s "$XVFBARGS" python -m orangecanvas --help
+
       - name: Upload Coverage
         uses: codecov/codecov-action@v4
         with:

diff --git a/orangecanvas/application/application.py b/orangecanvas/application/application.py
@@ -48,7 +48,7 @@ def fix_qt_plugins_path():
 
     if AnyQt.USED_API == "pyqt5":
         import PyQt5.QtCore as qc
-    if AnyQt.USED_API == "pyqt6":
+    elif AnyQt.USED_API == "pyqt6":
         import PyQt6.QtCore as qc
     elif AnyQt.USED_API == "pyside2":
         import PySide2.QtCore as qc