diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2015-12-01 18:10:36 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2015-12-01 18:10:36 -0500 |
| commit | c1077f94348090c0e4c2810fa33fef5ac5b11e73 (patch) | |
| tree | efaa69bb2a83d3e6d055c9baaa2daffb7f7f5ef8 /pcr/qgis/console_pyqt4.diff | |
| parent | 6bc0d7493bee291883320d826f771cad45679b97 (diff) | |
| download | abslibre-c1077f94348090c0e4c2810fa33fef5ac5b11e73.tar.gz abslibre-c1077f94348090c0e4c2810fa33fef5ac5b11e73.tar.bz2 abslibre-c1077f94348090c0e4c2810fa33fef5ac5b11e73.zip | |
qgis-2.12.1-1.parabola1: updating version
Diffstat (limited to 'pcr/qgis/console_pyqt4.diff')
| -rw-r--r-- | pcr/qgis/console_pyqt4.diff | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/pcr/qgis/console_pyqt4.diff b/pcr/qgis/console_pyqt4.diff deleted file mode 100644 index 0e2cedaea..000000000 --- a/pcr/qgis/console_pyqt4.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/a/python/console/console.py b/b/python/console/console.py -index c85c107..6406f12 100644 ---- a/python/console/console.py -+++ b/python/console/console.py -@@ -25,7 +25,6 @@ from PyQt4.QtGui import QDockWidget, QToolBar, QToolButton, QWidget,\ - 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 -@@ -36,8 +35,13 @@ from qgis.gui import QgsFilterLineEdit - - import sys - --_console = None -+try: -+ from PyQt4.QtCore import QT_VERSION # works if PyQt4 was built with configure-ng.py -+except ImportError: -+ from PyQt4 import pyqtconfig # works if built with configure.py -+ QT_VERSION = pyqtconfig.Configuration().qt_version - -+_console = None - - def show_console(): - """ called from QGIS to open the console """ |