Skip to content
Permalink
Browse files

Merge pull request #2623 from cjmayo/no-pyqtconfig

[pyqgis-console] Don't import pyqtconfig
  • Loading branch information
m-kuhn committed Jan 4, 2016
2 parents 1c464d6 + 6b42bad commit 49eaf16f52c2596c2341b198e0c4403517bcd5a8
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 49eaf16

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