suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for PyQt5.

Browse Source 
This change is Qt5 specific.
This commit is contained in:
maurerpe 2016-03-06 13:11:55 +01:00 committed by wmayer
parent b6d5bc489f
commit 657ac1f569
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/WidgetFactory.cpp
View File

@ -243,7 +243,11 @@ Py::Object PythonWrapper::fromQWidget(QWidget* widget, const char* className)
Py::Callable func = sipmod.getDict().getItem("wrapinstance"); Py::Callable func = sipmod.getDict().getItem("wrapinstance");
Py::Tuple arguments(2); Py::Tuple arguments(2);
arguments[0] = Py::asObject(PyLong_FromVoidPtr(widget)); arguments[0] = Py::asObject(PyLong_FromVoidPtr(widget));
#if QT_VERSION >= 0x050000
Py::Module qtmod(PyImport_ImportModule((char*)"PyQt5.QtWidgets"));
#else
Py::Module qtmod(PyImport_ImportModule((char*)"PyQt4.Qt")); Py::Module qtmod(PyImport_ImportModule((char*)"PyQt4.Qt"));
#endif
arguments[1] = qtmod.getDict().getItem("QWidget"); arguments[1] = qtmod.getDict().getItem("QWidget");
return func.apply(arguments); return func.apply(arguments);
#endif #endif