diff --git a/src/Gui/Quarter/EventFilter.cpp b/src/Gui/Quarter/EventFilter.cpp index f0bb794c2..060882e2a 100644 --- a/src/Gui/Quarter/EventFilter.cpp +++ b/src/Gui/Quarter/EventFilter.cpp @@ -85,9 +85,6 @@ public: device->setMousePosition(mousepos); } } - -private: - qreal device_pixel_ratio = 1.0; }; #define PRIVATE(obj) obj->pimpl diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index aa627ac51..516fdf973 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -3511,6 +3511,19 @@ PropertyItemEditorFactory::~PropertyItemEditorFactory() { } +#if (QT_VERSION >= 0x050300) +QWidget * PropertyItemEditorFactory::createEditor (int /*type*/, QWidget * /*parent*/) const +{ + // do not allow to create any editor widgets because we do that in subclasses of PropertyItem + return 0; +} + +QByteArray PropertyItemEditorFactory::valuePropertyName (int /*type*/) const +{ + // do not allow to set properties because we do that in subclasses of PropertyItem + return ""; +} +#else QWidget * PropertyItemEditorFactory::createEditor (QVariant::Type /*type*/, QWidget * /*parent*/) const { // do not allow to create any editor widgets because we do that in subclasses of PropertyItem @@ -3522,6 +3535,7 @@ QByteArray PropertyItemEditorFactory::valuePropertyName (QVariant::Type /*type*/ // do not allow to set properties because we do that in subclasses of PropertyItem return ""; } +#endif #include "moc_PropertyItem.cpp" diff --git a/src/Gui/propertyeditor/PropertyItem.h b/src/Gui/propertyeditor/PropertyItem.h index b55f717f3..7967591fb 100644 --- a/src/Gui/propertyeditor/PropertyItem.h +++ b/src/Gui/propertyeditor/PropertyItem.h @@ -945,8 +945,13 @@ public: PropertyItemEditorFactory(); virtual ~PropertyItemEditorFactory(); - virtual QWidget * createEditor ( QVariant::Type type, QWidget * parent ) const; - virtual QByteArray valuePropertyName ( QVariant::Type type ) const; +#if (QT_VERSION >= 0x050300) + virtual QWidget *createEditor(int userType, QWidget *parent) const; + virtual QByteArray valuePropertyName(int userType) const; +#else + virtual QWidget * createEditor(QVariant::Type type, QWidget * parent) const; + virtual QByteArray valuePropertyName (QVariant::Type type) const; +#endif }; } // namespace PropertyEditor