Skip to content
Permalink
Browse files

[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
  • Loading branch information
cjmayo committed Dec 30, 2015
1 parent 566dd4b commit 6b42bad753f4f69b5c8ceee51f618d0e248e6cbf
Showing with 1 addition and 5 deletions.
  1. +1 −5 python/console/console.py
@@ -25,7 +25,6 @@
QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, \
QDesktopServices
from PyQt4.QtGui import QVBoxLayout
from PyQt4 import pyqtconfig
from qgis.utils import iface
from console_sci import ShellScintilla
from console_output import ShellOutputScintilla
@@ -482,10 +481,7 @@ def __init__(self, parent=None):
self.lineEditFind = QgsFilterLineEdit()
placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...")

if pyqtconfig.Configuration().qt_version >= 0x40700:
self.lineEditFind.setPlaceholderText(placeHolderTxt)
else:
self.lineEditFind.setToolTip(placeHolderTxt)
self.lineEditFind.setPlaceholderText(placeHolderTxt)
self.findNextButton = QToolButton()
self.findNextButton.setEnabled(False)
toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next")

0 comments on commit 6b42bad

Please sign in to comment.
You can’t perform that action at this time.