Core: Qt6 migration, use PySide
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# (c) 2021 Werner Mayer LGPL
|
||||
|
||||
from PySide2 import QtUiTools
|
||||
from PySide import QtUiTools
|
||||
import FreeCADGui as Gui
|
||||
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@ public:
|
||||
}
|
||||
// paintGL() is invoked when e.g. using the method grabFramebuffer of this class
|
||||
// \code
|
||||
// from PySide2 import QtWidgets
|
||||
// from PySide import QtWidgets
|
||||
// mw = Gui.getMainWindow()
|
||||
// mdi = mw.findChild(QtWidgets.QMdiArea)
|
||||
// gl = mdi.findChild(QtWidgets.QOpenGLWidget)
|
||||
|
||||
@@ -120,7 +120,7 @@ Py::Object PySideUicModule::loadUiType(const Py::Tuple& args)
|
||||
QTextStream str(&cmd);
|
||||
// https://github.com/albop/dolo/blob/master/bin/load_ui.py
|
||||
str << "import pyside2uic\n"
|
||||
<< "from PySide2 import QtCore, QtGui, QtWidgets\n"
|
||||
<< "from PySide import QtCore, QtGui, QtWidgets\n"
|
||||
<< "import xml.etree.ElementTree as xml\n"
|
||||
<< "try:\n"
|
||||
<< " from cStringIO import StringIO\n"
|
||||
@@ -173,7 +173,7 @@ Py::Object PySideUicModule::loadUi(const Py::Tuple& args)
|
||||
QString cmd;
|
||||
QTextStream str(&cmd);
|
||||
|
||||
str << "from PySide2 import QtCore, QtGui, QtWidgets\n"
|
||||
str << "from PySide import QtCore, QtGui, QtWidgets\n"
|
||||
<< "import FreeCADGui"
|
||||
<< "\n"
|
||||
<< "loader = FreeCADGui.UiLoader()\n"
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
import FreeCAD, FreeCADGui, os, unittest
|
||||
import tempfile
|
||||
|
||||
from PySide2 import QtWidgets, QtCore
|
||||
from PySide2.QtWidgets import QApplication
|
||||
from PySide import QtWidgets, QtCore
|
||||
from PySide.QtWidgets import QApplication
|
||||
|
||||
class CallableCheckWarning:
|
||||
def __call__(self):
|
||||
|
||||
Reference in New Issue
Block a user