Skip to content

Commit

Permalink
move PyQt compat folder to python/qgis
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids @m-kuhn
3nids authored and m-kuhn committed Apr 29, 2016
1 parent a67853f commit 8071acd
Show file tree
Hide file tree
Showing 387 changed files with 645 additions and 645 deletions.
1 change: 1 addition & 0 deletions debian/python-qgis.install.in
View file
Expand Up @@ -4,6 +4,7 @@ usr/lib/python*/*-packages/qgis/core/*
usr/lib/python*/*-packages/qgis/gui/*
usr/lib/python*/*-packages/qgis/analysis/*
usr/lib/python*/*-packages/qgis/networkanalysis/*
usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/server/*
usr/lib/python*/*-packages/qgis/testing/*
#wheezy precise#usr/lib/python*/*-packages/pyspatialite/*.py
Expand Down
10 changes: 5 additions & 5 deletions python/PyQt/CMakeLists.txt
View file
@@ -1,5 +1,5 @@
SET (QGIS_PYQT_DIR ${QGIS_DATA_DIR}/python/PyQt)
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
SET (QGIS_PYQT_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis/PyQt)
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python/qgis/PyQt)

SET(PYQT_COMPAT_FILES
__init__.py
Expand Down Expand Up @@ -33,12 +33,12 @@ FOREACH(pyfile ${PYQT_COMPAT_FILES})
SET(pyfile ${PYQT_PREFIX}/${pyfile})
ADD_CUSTOM_COMMAND(TARGET pyqtcompat
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_OUTPUT_DIRECTORY}/PyQt/${_dir}
COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} ${PYTHON_OUTPUT_DIRECTORY}/PyQt/${_dir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTHON_OUTPUT_DIRECTORY}/${_dir}
COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} ${PYTHON_OUTPUT_DIRECTORY}/${_dir}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${pyfile}
)
INSTALL(FILES ${pyfile} DESTINATION "${QGIS_PYQT_DIR}/${_dir}")
ENDFOREACH(pyfile)

PY_COMPILE(pyqtcompat "${PYTHON_OUTPUT_DIRECTORY}/PyQt")
PY_COMPILE(pyqtcompat "${PYTHON_OUTPUT_DIRECTORY}")
12 changes: 6 additions & 6 deletions python/console/console.py
View file
Expand Up @@ -20,10 +20,10 @@
"""
import os

from PyQt.QtCore import Qt, QTimer, QSettings, QCoreApplication, QSize, QByteArray, QFileInfo, QUrl, QDir
from PyQt.QtWidgets import QDockWidget, QToolBar, QToolButton, QWidget, QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, QShortcut
from PyQt.QtGui import QDesktopServices, QKeySequence
from PyQt.QtWidgets import QVBoxLayout
from qgis.PyQt.QtCore import Qt, QTimer, QSettings, QCoreApplication, QSize, QByteArray, QFileInfo, QUrl, QDir
from qgis.PyQt.QtWidgets import QDockWidget, QToolBar, QToolButton, QWidget, QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, QShortcut
from qgis.PyQt.QtGui import QDesktopServices, QKeySequence
from qgis.PyQt.QtWidgets import QVBoxLayout
from qgis.utils import iface
from .console_sci import ShellScintilla
from .console_output import ShellOutputScintilla
Expand Down Expand Up @@ -403,10 +403,10 @@ def __init__(self, parent=None):
["import processing"],
(QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore Class"),
QgsApplication.getThemeIcon("console/iconQtCoreConsole.png")):
["from PyQt.QtCore import *"],
["from qgis.PyQt.QtCore import *"],
(QCoreApplication.translate("PythonConsole", "Import PyQt.QtGui Class"),
QgsApplication.getThemeIcon("console/iconQtGuiConsole.png")):
["from PyQt.QtGui import *", "from PyQt.QtWidgets import *"]
["from qgis.PyQt.QtGui import *", "from qgis.PyQt.QtWidgets import *"]
}

self.classMenu = QMenu()
Expand Down
6 changes: 3 additions & 3 deletions python/console/console_compile_apis.py
View file
Expand Up @@ -21,9 +21,9 @@

import os

from PyQt.Qsci import QsciAPIs
from PyQt.QtWidgets import QDialog, QDialogButtonBox
from PyQt.QtCore import QCoreApplication
from qgis.PyQt.Qsci import QsciAPIs
from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox
from qgis.PyQt.QtCore import QCoreApplication

from .ui_console_compile_apis import Ui_APIsDialogPythonConsole

Expand Down
8 changes: 4 additions & 4 deletions python/console/console_editor.py
View file
Expand Up @@ -18,10 +18,10 @@
***************************************************************************/
Some portions of code were taken from https://code.google.com/p/pydee/
"""
from PyQt.QtCore import Qt, QObject, QEvent, QSettings, QCoreApplication, QFileInfo, QSize
from PyQt.QtGui import QFont, QFontMetrics, QColor, QKeySequence, QCursor
from PyQt.QtWidgets import QShortcut, QMenu, QApplication, QWidget, QGridLayout, QSpacerItem, QSizePolicy, QFileDialog, QTabWidget, QTreeWidgetItem, QFrame, QLabel, QToolButton, QMessageBox
from PyQt.Qsci import QsciScintilla, QsciLexerPython, QsciAPIs, QsciStyle
from qgis.PyQt.QtCore import Qt, QObject, QEvent, QSettings, QCoreApplication, QFileInfo, QSize
from qgis.PyQt.QtGui import QFont, QFontMetrics, QColor, QKeySequence, QCursor
from qgis.PyQt.QtWidgets import QShortcut, QMenu, QApplication, QWidget, QGridLayout, QSpacerItem, QSizePolicy, QFileDialog, QTabWidget, QTreeWidgetItem, QFrame, QLabel, QToolButton, QMessageBox
from qgis.PyQt.Qsci import QsciScintilla, QsciLexerPython, QsciAPIs, QsciStyle
from qgis.core import QgsApplication
from qgis.gui import QgsMessageBar
import sys
Expand Down
8 changes: 4 additions & 4 deletions python/console/console_output.py
View file
Expand Up @@ -19,10 +19,10 @@
Some portions of code were taken from https://code.google.com/p/pydee/
"""

from PyQt.QtCore import Qt, QCoreApplication, QSettings
from PyQt.QtGui import QColor, QFont, QKeySequence
from PyQt.QtWidgets import QGridLayout, QSpacerItem, QSizePolicy, QShortcut, QMenu, QApplication
from PyQt.Qsci import QsciScintilla, QsciLexerPython
from qgis.PyQt.QtCore import Qt, QCoreApplication, QSettings
from qgis.PyQt.QtGui import QColor, QFont, QKeySequence
from qgis.PyQt.QtWidgets import QGridLayout, QSpacerItem, QSizePolicy, QShortcut, QMenu, QApplication
from qgis.PyQt.Qsci import QsciScintilla, QsciLexerPython
from qgis.core import QgsApplication
from qgis.gui import QgsMessageBar
import sys
Expand Down
8 changes: 4 additions & 4 deletions python/console/console_sci.py
View file
Expand Up @@ -19,10 +19,10 @@
Some portions of code were taken from https://code.google.com/p/pydee/
"""

from PyQt.QtCore import Qt, QSettings, QByteArray, QCoreApplication, QFile, QSize
from PyQt.QtWidgets import QDialog, QMenu, QShortcut, QApplication
from PyQt.QtGui import QColor, QKeySequence, QFont, QFontMetrics, QStandardItemModel, QStandardItem, QClipboard
from PyQt.Qsci import QsciScintilla, QsciLexerPython, QsciAPIs
from qgis.PyQt.QtCore import Qt, QSettings, QByteArray, QCoreApplication, QFile, QSize
from qgis.PyQt.QtWidgets import QDialog, QMenu, QShortcut, QApplication
from qgis.PyQt.QtGui import QColor, QKeySequence, QFont, QFontMetrics, QStandardItemModel, QStandardItem, QClipboard
from qgis.PyQt.Qsci import QsciScintilla, QsciLexerPython, QsciAPIs

import sys
import os
Expand Down
6 changes: 3 additions & 3 deletions python/console/console_settings.py
View file
Expand Up @@ -19,9 +19,9 @@
Some portions of code were taken from https://code.google.com/p/pydee/
"""

from PyQt.QtCore import QCoreApplication, QSize, QSettings, QFileInfo, Qt
from PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QTableWidgetItem
from PyQt.QtGui import QIcon, QFont, QColor
from qgis.PyQt.QtCore import QCoreApplication, QSize, QSettings, QFileInfo, Qt
from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QTableWidgetItem
from qgis.PyQt.QtGui import QIcon, QFont, QColor
from .console_compile_apis import PrepareAPIDialog

from .ui_console_settings import Ui_SettingsDialogPythonConsole
Expand Down
2 changes: 1 addition & 1 deletion python/core/__init__.py
View file
Expand Up @@ -23,7 +23,7 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QCoreApplication, QPyNullVariant, NULL
from qgis.PyQt.QtCore import QCoreApplication, QPyNullVariant, NULL

import inspect
import string
Expand Down
3 changes: 1 addition & 2 deletions python/gui/__init__.py
View file
Expand Up @@ -23,6 +23,5 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt import QtCore

from qgis.PyQt import QtCore
from qgis._gui import *
6 changes: 3 additions & 3 deletions python/plugins/GdalTools/GdalTools.py
View file
Expand Up @@ -18,9 +18,9 @@
***************************************************************************/
"""
# Import the PyQt and QGIS libraries
from PyQt.QtCore import QCoreApplication, QSettings, QLocale, QFileInfo, QTranslator
from PyQt.QtWidgets import QMessageBox, QMenu, QAction
from PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QCoreApplication, QSettings, QLocale, QFileInfo, QTranslator
from qgis.PyQt.QtWidgets import QMessageBox, QMenu, QAction
from qgis.PyQt.QtGui import QIcon
from qgis.core import QGis
import qgis.utils

Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/GdalTools_utils.py
View file
Expand Up @@ -29,8 +29,8 @@
# setLastUsedDir( QString *file_or_dir path )
# -------------------------------------------------

from PyQt.QtCore import QObject, QSettings, QFileInfo, QDir, QCoreApplication, pyqtSignal
from PyQt.QtWidgets import QFileDialog
from qgis.PyQt.QtCore import QObject, QSettings, QFileInfo, QDir, QCoreApplication, pyqtSignal
from qgis.PyQt.QtWidgets import QFileDialog

from qgis.core import QgsApplication, QgsMapLayerRegistry, QgsRectangle, QgsProviderRegistry, QgsLogger
from qgis.gui import QgsEncodingFileDialog
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/GdalTools/tools/dialogBase.py
View file
Expand Up @@ -23,9 +23,9 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import Qt, QProcess, QUrl, QIODevice, QCoreApplication, pyqtSignal
from PyQt.QtWidgets import QDialog, QDialogButtonBox, QMessageBox, QErrorMessage, QApplication
from PyQt.QtGui import QIcon, QDesktopServices
from qgis.PyQt.QtCore import Qt, QProcess, QUrl, QIODevice, QCoreApplication, pyqtSignal
from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QMessageBox, QErrorMessage, QApplication
from qgis.PyQt.QtGui import QIcon, QDesktopServices

# to know the os
import platform
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/dialogSRS.py
View file
Expand Up @@ -23,7 +23,7 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtWidgets import QDialog, QVBoxLayout, QDialogButtonBox
from qgis.PyQt.QtWidgets import QDialog, QVBoxLayout, QDialogButtonBox
from qgis.gui import QgsProjectionSelector


Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doBuildVRT.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QCoreApplication
from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtCore import QCoreApplication
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetBuildVRT import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doClipper.py
View file
Expand Up @@ -23,7 +23,7 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtWidgets import QWidget
from qgis.core import QGis

from .ui_widgetClipper import Ui_GdalToolsWidget as Ui_Widget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doContour.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QDir
from PyQt.QtWidgets import QWidget, QApplication
from qgis.PyQt.QtCore import QDir
from qgis.PyQt.QtWidgets import QWidget, QApplication

from .ui_widgetContour import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doDEM.py
View file
Expand Up @@ -23,7 +23,7 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetDEM import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/GdalTools/tools/doExtractProj.py
View file
Expand Up @@ -23,9 +23,9 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import Qt, QCoreApplication, QThread, QMutex
from PyQt.QtWidgets import QDialog, QDialogButtonBox, QApplication, QMessageBox
from PyQt.QtGui import QCursor
from qgis.PyQt.QtCore import Qt, QCoreApplication, QThread, QMutex
from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QApplication, QMessageBox
from qgis.PyQt.QtGui import QCursor

from .ui_dialogExtractProjection import Ui_GdalToolsDialog as Ui_Dialog
from . import GdalTools_utils as Utils
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doFillNodata.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import Qt, QCoreApplication, QDir
from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtCore import Qt, QCoreApplication, QDir
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetFillNodata import Ui_GdalToolsWidget as Ui_Widget
from .widgetBatchBase import GdalToolsBaseBatchWidget as BaseBatchWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doGrid.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QFileInfo, QTextCodec
from PyQt.QtWidgets import QWidget, QErrorMessage
from qgis.PyQt.QtCore import QFileInfo, QTextCodec
from qgis.PyQt.QtWidgets import QWidget, QErrorMessage

from .ui_widgetGrid import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doInfo.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import Qt
from PyQt.QtWidgets import QWidget, QAction, QApplication, QMenu
from qgis.PyQt.QtCore import Qt
from qgis.PyQt.QtWidgets import QWidget, QAction, QApplication, QMenu

from .ui_widgetInfo import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doMerge.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QCoreApplication
from PyQt.QtWidgets import QWidget, QMessageBox
from qgis.PyQt.QtCore import QCoreApplication
from qgis.PyQt.QtWidgets import QWidget, QMessageBox

from .ui_widgetMerge import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doNearBlack.py
View file
Expand Up @@ -23,7 +23,7 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetNearBlack import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doOverview.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QCoreApplication
from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtCore import QCoreApplication
from qgis.PyQt.QtWidgets import QWidget
from qgis.core import QgsRaster

from .ui_widgetOverview import Ui_GdalToolsWidget as Ui_Widget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doPctRgb.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QCoreApplication
from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtCore import QCoreApplication
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetConvert import Ui_GdalToolsWidget as Ui_Widget
from .widgetBatchBase import GdalToolsBaseBatchWidget as BaseBatchWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doPolygonize.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QFileInfo
from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtCore import QFileInfo
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetPolygonize import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doProjection.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import Qt, QCoreApplication, QFile, QFileInfo
from PyQt.QtWidgets import QWidget, QMessageBox
from qgis.PyQt.QtCore import Qt, QCoreApplication, QFile, QFileInfo
from qgis.PyQt.QtWidgets import QWidget, QMessageBox
from qgis.core import QgsMapLayerRegistry, QgsMapLayer

from .ui_widgetProjection import Ui_GdalToolsWidget as Ui_Widget
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doProximity.py
View file
Expand Up @@ -23,7 +23,7 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetProximity import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doRasterize.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QFileInfo, QTextCodec
from PyQt.QtWidgets import QWidget, QMessageBox, QErrorMessage
from qgis.PyQt.QtCore import QFileInfo, QTextCodec
from qgis.PyQt.QtWidgets import QWidget, QMessageBox, QErrorMessage

from .ui_widgetRasterize import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doRgbPct.py
View file
Expand Up @@ -23,8 +23,8 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import QCoreApplication
from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtCore import QCoreApplication
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetConvert import Ui_GdalToolsWidget as Ui_Widget
from .widgetBatchBase import GdalToolsBaseBatchWidget as BaseBatchWidget
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/GdalTools/tools/doSettings.py
View file
Expand Up @@ -23,9 +23,9 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtCore import Qt
from PyQt.QtWidgets import QDialog
from PyQt.QtGui import QPixmap
from qgis.PyQt.QtCore import Qt
from qgis.PyQt.QtWidgets import QDialog
from qgis.PyQt.QtGui import QPixmap

from .ui_dialogSettings import Ui_GdalToolsSettingsDialog as Ui_Dialog
from . import GdalTools_utils as Utils
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doSieve.py
View file
Expand Up @@ -23,7 +23,7 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt.QtWidgets import QWidget
from qgis.PyQt.QtWidgets import QWidget

from .ui_widgetSieve import Ui_GdalToolsWidget as Ui_Widget
from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
Expand Down

0 comments on commit 8071acd

Please sign in to comment.