Skip to content

Commit

Permalink
pyqtwrapper: update some remaining scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Mar 25, 2016
1 parent f129540 commit 8af5edc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/generate_test_mask_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import os
import sys
import argparse
from PyQt4.QtGui import QImage, QColor
from PyQt.QtGui import QImage, QColor
import struct
import urllib2
import glob
Expand Down
1 change: 1 addition & 0 deletions scripts/qgis_fixes/fix_pyqt.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@
"PyQt4.uic": [
("PyQt.uic", [
"loadUiType",
"loadUi",
]),
],
"PyQt4": [
Expand Down
2 changes: 1 addition & 1 deletion scripts/widgets_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import os
import glob
from PyQt.QtWidgets import QWidget, QDialog, QCheckBox, QComboBox, QDial, QPushButton, QLabel, QLCDNumber, QLineEdit, QRadioButton, QScrollBar, QSlider, QSpinBox, QTextEdit, QDateEdit, QTimeEdit, QDateTimeEdit, QListView, QProgressBar, QTableView, QTabWidget, QTextBrowser, QDialogButtonBox, QScrollArea, QGroupBox, QStackedWidget
from PyQt4.uic import loadUi
from PyQt.uic import loadUi
from PyQt.QtXml import QDomDocument

# qwt_plot is missing somehow but it may depend on installed packages
Expand Down
2 changes: 1 addition & 1 deletion tests/src/python/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import platform
import tempfile

from PyQt4.QtCore import QDir
from PyQt.QtCore import QDir

from qgis.core import (
QgsCoordinateReferenceSystem,
Expand Down

0 comments on commit 8af5edc

Please sign in to comment.