Mercurial Repositories > eric / changeset
changeset
Continued porting the web browser.
Sat, 19 Mar 2016 11:27:03 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 19 Mar 2016 11:27:03 +0100
- branch
- QtWebEngine
- changeset 4869
- d1b3addfbd07
- parent 4868
- 985d275502c8
- child 4870
- 72901685681d
Continued porting the web browser.
- finished porting the eric:speeddial code
--- a/UI/UserInterface.py Fri Mar 18 20:05:12 2016 +0100 +++ b/UI/UserInterface.py Sat Mar 19 11:27:03 2016 +0100 @@ -32,8 +32,7 @@ WEBKIT_AVAILABLE = True except ImportError: WEBKIT_AVAILABLE = False -# TODO: adjust this to 5.6.0 when done -if qVersion() < "5.5.0": +if qVersion() < "5.6.0": WEBENGINE_AVAILABLE = False else: try:
--- a/Utilities/__init__.py Fri Mar 18 20:05:12 2016 +0100 +++ b/Utilities/__init__.py Sat Mar 19 11:27:03 2016 +0100 @@ -1682,8 +1682,7 @@ qVersion(), linesep, PYQT_VERSION_STR, linesep) info += " sip {0}{1} QScintilla {2}{3}".format( sip_version_str, linesep, QSCINTILLA_VERSION_STR, linesep) - # TODO: adjust this to 5.6.0 when done - if qVersion() >= "5.5.0": + if qVersion() >= "5.6.0": try: from PyQt5 import QtWebEngineWidgets # __IGNORE_WARNING__ from WebBrowser.Tools import WebBrowserTools
--- a/WebBrowser/SpeedDial/PageThumbnailer.py Fri Mar 18 20:05:12 2016 +0100 +++ b/WebBrowser/SpeedDial/PageThumbnailer.py Sat Mar 19 11:27:03 2016 +0100 @@ -39,8 +39,7 @@ self.__url = QUrl() self.__view = QQuickWidget() - # TODO: uncomment once PyQt5 is fixed -## self.__view.setAttribute(Qt.WA_DontShowOnScreen) + self.__view.setAttribute(Qt.WA_DontShowOnScreen) self.__view.setSource(QUrl("qrc:qml/thumbnailer.qml")) self.__view.rootContext().setContextProperty("thumbnailer", self) self.__view.show()
--- a/eric6_browser.py Fri Mar 18 20:05:12 2016 +0100 +++ b/eric6_browser.py Sat Mar 19 11:27:03 2016 +0100 @@ -30,8 +30,7 @@ import sys import os -# TODO: adjust this to 5.6.0 when done -MIN_QT_VERSION = "5.5.0" +MIN_QT_VERSION = "5.6.0" from PyQt5.QtCore import qVersion if qVersion() < MIN_QT_VERSION:
--- a/eric6_configure.py Fri Mar 18 20:05:12 2016 +0100 +++ b/eric6_configure.py Sat Mar 19 11:27:03 2016 +0100 @@ -37,9 +37,8 @@ settingsDir) sys.argv.remove(arg) -# TODO: adjust this to 5.6.0 when done from PyQt5.QtCore import qVersion -if qVersion() < "5.5.0": +if qVersion() < "5.6.0": WEBENGINE_AVAILABLE = False else: try:
