Skip to content

Commit

Permalink
[pyqgis-console] Don't import pyqtconfig
Browse files Browse the repository at this point in the history
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 6b42bad
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions python/console/console.py
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 6b42bad

Please sign in to comment.