diff -r d2f2a1fe0129 -r 2079ccbfa335 scripts/install.py
--- a/scripts/install.py Mon Sep 02 18:51:38 2019 +0200
+++ b/scripts/install.py Mon Sep 02 18:52:31 2019 +0200
@@ -501,6 +501,8 @@
"eric6_pluginrepository", "eric6_sqlbrowser",
"eric6_iconeditor", "eric6_snap", "eric6_hexeditor",
"eric6_browser", "eric6_shell",
+ # from Python2 era
+ "eric6_webbrowser",
]
try:
@@ -577,6 +579,8 @@
"/usr/share/applications/eric6_browser.desktop",
"/usr/share/pixmaps/eric.png",
"/usr/share/pixmaps/ericWeb.png",
+ # from Python2 era
+ "/usr/share/applications/eric6_webbrowser.desktop",
]:
if os.path.exists(name):
os.remove(name)
@@ -594,6 +598,8 @@
"~/.local/share/applications/eric6_browser.desktop",
"~/.local/share/pixmaps/eric.png",
"~/.local/share/pixmaps/ericWeb.png",
+ # from Python2 era
+ "/usr/share/applications/eric6_webbrowser.desktop",
]:
path = os.path.expanduser(name)
if os.path.exists(path):
@@ -1337,7 +1343,7 @@
from PyQt5 import QtWebEngineWidgets # __IGNORE_WARNING__
except ImportError as msg:
from PyQt5.QtCore import PYQT_VERSION
- if PYQT_VERSION >= 0x50c00:
+ if PYQT_VERSION >= 0x050c00:
# PyQt 5.12 separated QtWebEngine into a separate wheel
installed = pipInstall(
"PyQtWebEngine",
@@ -1669,7 +1675,8 @@
@return name of the Start Menu top entry
@rtype str
"""
- return "eric6"
+ majorVersion, minorVersion = sys.version_info[:2]
+ return "eric6 (Python {0}.{1})".format(majorVersion, minorVersion)
def main(argv):
