Sun, 19 Sep 2021 16:13:41 +0200
Removed the Linux workaround for QWebEngine.
eric7/eric7.py | file | annotate | diff | comparison | revisions | |
eric7/eric7_browser.py | file | annotate | diff | comparison | revisions |
--- a/eric7/eric7.py Sun Sep 19 15:49:45 2021 +0200 +++ b/eric7/eric7.py Sun Sep 19 16:13:41 2021 +0200 @@ -42,12 +42,6 @@ " it is installed and accessible.") sys.exit(100) -# TODO: remove this workaround once issue is fixed -# Workaround for a bug in Qt 6.2.0 beta3 on Linux -if sys.platform.startswith("linux"): - libraryPath = QLibraryInfo.path(QLibraryInfo.LibraryPath.LibrariesPath) - os.environ["LD_LIBRARY_PATH"] = libraryPath - with contextlib.suppress(ImportError): from PyQt6 import QtWebEngineWidgets # __IGNORE_WARNING__ __IGNORE_EXCEPTION__
--- a/eric7/eric7_browser.py Sun Sep 19 15:49:45 2021 +0200 +++ b/eric7/eric7_browser.py Sun Sep 19 16:13:41 2021 +0200 @@ -35,13 +35,6 @@ QSettings.Format.IniFormat, QSettings.Scope.UserScope, SettingsDir) sys.argv.remove(arg) -# TODO: remove this workaround once issue is fixed -# Workaround for a bug in Qt 6.2.0 beta3 on Linux -if sys.platform.startswith("linux"): - from PyQt6.QtCore import QLibraryInfo - libraryPath = QLibraryInfo.path(QLibraryInfo.LibraryPath.LibrariesPath) - os.environ["LD_LIBRARY_PATH"] = libraryPath - try: from PyQt6 import QtWebEngineWidgets # __IGNORE_WARNING__ except ImportError: