Skip to content

Commit 6b42bad

Browse files
committed
[pyqgis-console] Don't import pyqtconfig
pyqtconfig may not have been installed by PyQt4, leading to an error. Was used to test for qt_version >= 0x40700 but CMakeLists.txt now checks for QT_MIN_VERSION 4.8.0
1 parent 566dd4b commit 6b42bad

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

python/console/console.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, \
2626
QDesktopServices
2727
from PyQt4.QtGui import QVBoxLayout
28-
from PyQt4 import pyqtconfig
2928
from qgis.utils import iface
3029
from console_sci import ShellScintilla
3130
from console_output import ShellOutputScintilla
@@ -482,10 +481,7 @@ def __init__(self, parent=None):
482481
self.lineEditFind = QgsFilterLineEdit()
483482
placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...")
484483

485-
if pyqtconfig.Configuration().qt_version >= 0x40700:
486-
self.lineEditFind.setPlaceholderText(placeHolderTxt)
487-
else:
488-
self.lineEditFind.setToolTip(placeHolderTxt)
484+
self.lineEditFind.setPlaceholderText(placeHolderTxt)
489485
self.findNextButton = QToolButton()
490486
self.findNextButton.setEnabled(False)
491487
toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next")

0 commit comments

Comments
 (0)