diff options
| author | Christian Tismer <tismer@stackless.com> | 2015-09-21 20:39:16 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2015-09-21 20:39:16 +0200 |
| commit | 7d3823d1cae8fd893d284a72dd603fdeed54eff6 (patch) | |
| tree | 4ed2419ea4aac61134ceb22e4fa710092519bf1a | |
| parent | 0da0cf77038efd52172216b4cdcd3f3d8c4ddda9 (diff) | |
no message
| -rw-r--r-- | pyrcc/rcc.cpp | 2 | ||||
| -rw-r--r-- | pyside-uic | 4 | ||||
| -rw-r--r-- | pysideuic/Compiler/compiler.py | 2 | ||||
| -rw-r--r-- | pysideuic/driver.py | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pyrcc/rcc.cpp b/pyrcc/rcc.cpp index abdf2a9..68f3858 100644 --- a/pyrcc/rcc.cpp +++ b/pyrcc/rcc.cpp @@ -403,7 +403,7 @@ RCCResourceLibrary::writeHeader(FILE *out) fprintf(out, "#\n"); fprintf(out, "# WARNING! All changes made in this file will be lost!\n"); fprintf(out, "\n"); - fprintf(out, "from PySide import QtCore\n\n"); + fprintf(out, "from PySide2 import QtCore\n\n"); return true; } @@ -24,9 +24,9 @@ import sys import optparse -from PySide import QtCore +from PySide2 import QtCore from pysideuic.driver import Driver -from PySide import __version__ as PySideVersion +from PySide2 import __version__ as PySideVersion from pysideuic import __version__ as PySideUicVersion Version = "PySide User Interface Compiler version %s, running on PySide %s." % (PySideUicVersion, PySideVersion) diff --git a/pysideuic/Compiler/compiler.py b/pysideuic/Compiler/compiler.py index a842533..b25406a 100644 --- a/pysideuic/Compiler/compiler.py +++ b/pysideuic/Compiler/compiler.py @@ -47,7 +47,7 @@ class UICompiler(UIParser): indenter = getIndenter() indenter.level = 0 - indenter.write("from PySide import QtCore, QtGui") + indenter.write("from PySide2 import QtCore, QtGui") indenter.write("") indenter.write("class Ui_%s(object):" % self.uiname) diff --git a/pysideuic/driver.py b/pysideuic/driver.py index e6ae0ac..129c330 100644 --- a/pysideuic/driver.py +++ b/pysideuic/driver.py @@ -66,8 +66,8 @@ class Driver(object): the parent process. """ - from PySide import QtUiTools - from PySide import QtGui + from PySide2 import QtUiTools + from PySide2 import QtGui app = QtGui.QApplication([self._ui_file]) widget = QtUiTools.QUiLoader().load(self._ui_file) @@ -119,7 +119,7 @@ class Driver(object): traceback.print_exception(*sys.exc_info()) else: - from PySide import QtCore + from PySide2 import QtCore sys.stderr.write("""An unexpected error occurred. Check that you are using the latest version of PySide and report the error to |