From 93321dc208606a3b0bd2beae1fdec62087253d19 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 7 Sep 2019 13:40:04 +0200 Subject: [PATCH] make PySideUicModule working independent of linking PySide or loading it at runtime --- src/Gui/WidgetFactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp index 0493adeb51..530dff650c 100644 --- a/src/Gui/WidgetFactory.cpp +++ b/src/Gui/WidgetFactory.cpp @@ -754,7 +754,7 @@ Py::Object PySideUicModule::loadUiType(const Py::Tuple& args) QString cmd; QTextStream str(&cmd); // https://github.com/albop/dolo/blob/master/bin/load_ui.py -#if defined(HAVE_PYSIDE2) +#if QT_VERSION >= 0x050000 str << "import pyside2uic\n" << "from PySide2 import QtCore, QtGui, QtWidgets\n" << "import xml.etree.ElementTree as xml\n" @@ -856,7 +856,7 @@ Py::Object PySideUicModule::loadUi(const Py::Tuple& args) << "loader = UiLoader(globals()[\"base_\"])\n" << "widget = loader.load(globals()[\"uiFile_\"])\n" << "\n"; -#elif defined(HAVE_PYSIDE2) +#elif QT_VERSION >= 0x050000 str << "from PySide2 import QtCore, QtGui, QtWidgets\n" << "import FreeCADGui" << "\n"