Qt4/Qt5 neutral changes:

+ change inheritance of PropertyItem to not derive from BaseClass (and QObject) any more to fix crashes with Qt5
2016-12-12 17:01:26 +01:00
parent 8b51a04943
commit b2487828f0
9 changed files with 136 additions and 78 deletions
--- a/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp
+++ b/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp
@@ -33,7 +33,7 @@
 using namespace FemGui;


-TYPESYSTEM_SOURCE(FemGui::PropertyFemMeshItem, Gui::PropertyEditor::PropertyItem);
+PROPERTYITEM_SOURCE(FemGui::PropertyFemMeshItem)

 PropertyFemMeshItem::PropertyFemMeshItem()
 {
--- a/src/Mod/Fem/Gui/PropertyFemMeshItem.h
+++ b/src/Mod/Fem/Gui/PropertyFemMeshItem.h
@@ -41,7 +41,7 @@ class PropertyFemMeshItem : public Gui::PropertyEditor::PropertyItem
    Q_PROPERTY(int Volumes READ countVolumes)
    Q_PROPERTY(int Polyhedrons READ countPolyhedrons)
    Q_PROPERTY(int Groups READ countGroups)
-    TYPESYSTEM_HEADER();
+    PROPERTYITEM_HEADER

    virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const;
    virtual void setEditorData(QWidget *editor, const QVariant& data) const;