Skip to content

Commit

Permalink
Merge pull request #9456 from Gustry/pyqt
Browse files Browse the repository at this point in the history
replace some PyQt5 to qgis.PyQt
  • Loading branch information
m-kuhn authored Mar 10, 2019
2 parents a91ecd5 + 312473c commit 7ceb97a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion python/plugins/MetaSearch/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#
###############################################################################

# avoid PendingDeprecationWarning from PyQt4.uic
# avoid PendingDeprecationWarning from qgis.PyQt.uic
import warnings
warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
warnings.filterwarnings("ignore", category=DeprecationWarning)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/FieldsMapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
QgsProcessingParameterType,
NULL)

from PyQt5.QtCore import QCoreApplication
from qgis.PyQt.QtCore import QCoreApplication

from processing.algs.qgis.QgisAlgorithm import QgisFeatureBasedAlgorithm

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/core/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
QgsProcessingParameterFeatureSource,
QgsProcessingParameterNumber)

from PyQt5.QtCore import QCoreApplication
from qgis.PyQt.QtCore import QCoreApplication

PARAMETER_NUMBER = 'number'
PARAMETER_DISTANCE = 'distance'
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/script/ScriptTemplate.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
***************************************************************************
"""

from PyQt5.QtCore import QCoreApplication
from qgis.PyQt.QtCore import QCoreApplication
from qgis.core import (QgsProcessing,
QgsFeatureSink,
QgsProcessingException,
Expand Down

0 comments on commit 7ceb97a

Please sign in to comment.