Merge pull request #2623 from cjmayo/no-pyqtconfig

[pyqgis-console] Don't import pyqtconfig
qgis · Jan 4, 2016 · 49eaf16 · 49eaf16
2 parents 1c464d6 + 6b42bad
commit 49eaf16
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/python/console/console.py b/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")