diff -r b4c1f0b6dac2 -r 795992a5c561 Helpviewer/HelpBrowserWV.py
--- a/Helpviewer/HelpBrowserWV.py Mon Oct 01 19:55:49 2012 +0200
+++ b/Helpviewer/HelpBrowserWV.py Tue Oct 02 19:53:31 2012 +0200
@@ -10,7 +10,7 @@
from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, QUrl, \
QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, QRect, QFile, QPoint, \
- QByteArray, qVersion
+ QPointF, QByteArray, qVersion
from PyQt4.QtGui import qApp, QDesktopServices, QStyle, QMenu, QApplication, \
QInputDialog, QLineEdit, QClipboard, QMouseEvent, QLabel, QToolTip, QColor, \
QPalette, QFrame, QPrinter, QPrintDialog, QDialog
@@ -553,8 +553,12 @@
# Fake a mouse move event just outside of the widget to trigger
# the WebKit event handler's mouseMoved function. This implements
# the interesting mouse-out behavior like invalidating scrollbars.
- fakeEvent = QMouseEvent(QEvent.MouseMove, QPoint(0, -1),
- Qt.NoButton, Qt.NoButton, Qt.NoModifier)
+ if qVersion() >= "5.0.0":
+ fakeEvent = QMouseEvent(QEvent.MouseMove, QPointF(0, -1),
+ Qt.NoButton, Qt.NoButton, Qt.NoModifier)
+ else:
+ fakeEvent = QMouseEvent(QEvent.MouseMove, QPoint(0, -1),
+ Qt.NoButton, Qt.NoButton, Qt.NoModifier)
return super().event(fakeEvent)
return super().event(evt)
@@ -785,8 +789,13 @@
""" for URL <b>{0}</b>.</p>""").format(name.toString()))
return
elif name.scheme() == "javascript":
- scriptSource = QUrl.fromPercentEncoding(name.toString(
- QUrl.FormattingOptions(QUrl.TolerantMode | QUrl.RemoveScheme)))
+ if qVersion() >= "5.0.0":
+ scriptSource = QUrl.fromPercentEncoding(name.toString(
+ QUrl.ComponentFormattingOptions(
+ QUrl.TolerantMode | QUrl.RemoveScheme)))
+ else:
+ scriptSource = QUrl.fromPercentEncoding(name.toString(
+ QUrl.FormattingOptions(QUrl.TolerantMode | QUrl.RemoveScheme)))
self.page().mainFrame().evaluateJavaScript(scriptSource)
return
else:
@@ -1925,11 +1934,19 @@
while frame and frame != self.page().mainFrame():
p -= frame.scrollPosition()
frame = frame.parentFrame()
- pevent = QMouseEvent(QEvent.MouseButtonPress, p, Qt.LeftButton,
- Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier))
+ if qVersion() >= "5.0.0":
+ pevent = QMouseEvent(QEvent.MouseButtonPress, QPointF(p), Qt.LeftButton,
+ Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier))
+ else:
+ pevent = QMouseEvent(QEvent.MouseButtonPress, p, Qt.LeftButton,
+ Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier))
qApp.sendEvent(self, pevent)
- revent = QMouseEvent(QEvent.MouseButtonRelease, p, Qt.LeftButton,
- Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier))
+ if qVersion() >= "5.0.0":
+ revent = QMouseEvent(QEvent.MouseButtonRelease, QPointF(p), Qt.LeftButton,
+ Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier))
+ else:
+ revent = QMouseEvent(QEvent.MouseButtonRelease, p, Qt.LeftButton,
+ Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier))
qApp.sendEvent(self, revent)
handled = True
