diff -r f606dbe20be6 -r 000ea446ff4b E5Gui/E5LineEdit.py
--- a/E5Gui/E5LineEdit.py Sat May 13 13:46:05 2017 +0200
+++ b/E5Gui/E5LineEdit.py Sat May 13 16:32:54 2017 +0200
@@ -9,11 +9,14 @@
from __future__ import unicode_literals
-from PyQt5.QtCore import pyqtSignal, Qt, QEvent, qVersion
+from PyQt5.QtCore import pyqtSignal, Qt, QEvent
from PyQt5.QtGui import QPainter, QPalette
from PyQt5.QtWidgets import QLineEdit, QStyle, QWidget, QHBoxLayout, \
QBoxLayout, QLayout, QApplication, QSpacerItem, QSizePolicy
-if qVersion() >= "5.0.0":
+
+from Globals import qVersionTuple
+
+if qVersionTuple() >= (5, 0, 0):
from PyQt5.QtWidgets import QStyleOptionFrame
else:
from PyQt5.QtWidgets import QStyleOptionFrameV2 as QStyleOptionFrame
@@ -67,7 +70,7 @@
self.setMinimumHeight(22)
- if qVersion() < "4.7.0":
+ if qVersionTuple() < (4, 7, 0):
self.__inactiveText = inactiveText
else:
self.setPlaceholderText(inactiveText)
@@ -154,7 +157,7 @@
"""
super(E5LineEdit, self).paintEvent(evt)
- if qVersion() < "4.7.0":
+ if qVersionTuple() < (4, 7, 0):
if not self.text() and \
self.__inactiveText and \
not self.hasFocus():
@@ -262,7 +265,7 @@
@return inactive text (string)
"""
- if qVersion() < "4.7.0":
+ if qVersionTuple() < (4, 7, 0):
return self.__inactiveText
else:
return self.placeholderText()
@@ -273,7 +276,7 @@
@param inactiveText text to be shown on inactivity (string)
"""
- if qVersion() < "4.7.0":
+ if qVersionTuple() < (4, 7, 0):
self.__inactiveText = inactiveText
self.update()
else:
