diff options
| author |   Amy Winston <amynka@gentoo.org> | 2015-12-30 20:56:58 +0100 |
|---|---|---|
| committer | Amy Winston <amynka@gentoo.org> | 2015-12-30 20:56:58 +0100 |
| commit | 6255ee73b3b2a4c898f6f93342345db6d09297f0 (patch) | |
| tree | 09b5ef405bc22beab0427858c01553f4df5cb25c /sci-geosciences/qgis/files | |
| parent | base/package.use.mask: mask development flag for metasploit (diff) | |
| download | gentoo-6255ee73b3b2a4c898f6f93342345db6d09297f0.tar.gz gentoo-6255ee73b3b2a4c898f6f93342345db6d09297f0.tar.bz2 gentoo-6255ee73b3b2a4c898f6f93342345db6d09297f0.zip | |
sci-geosciences/qgis: 2.12.2 version bump bug #570142.
Package-Manager: portage-2.2.24
Diffstat (limited to 'sci-geosciences/qgis/files')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch new file mode 100644 index 000000000000..24fe7bff6cfa --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch @@ -0,0 +1,23 @@ +diff -ur qgis-2.12.0.orig/python/console/console.py qgis-2.12.0/python/console/console.py +--- qgis-2.12.0.orig/python/console/console.py ++++ qgis-2.12.0/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 @@ + 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") |