From f1762edd6c39f35baaf412461ebcc5fc1c9d15ab Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 12 May 2014 13:39:57 +0200 Subject: [PATCH] + workaround to avoid to create invalid code with moc --- src/Gui/InputField.h | 2 ++ src/Gui/propertyeditor/PropertyItem.cpp | 1 + src/Gui/propertyeditor/PropertyItem.h | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Gui/InputField.h b/src/Gui/InputField.h index 7fbab4c25..8c805cab2 100644 --- a/src/Gui/InputField.h +++ b/src/Gui/InputField.h @@ -32,7 +32,9 @@ #include "SpinBox.h" #include "FileDialog.h" +#ifdef Q_MOC_RUN Q_DECLARE_METATYPE(Base::Quantity) +#endif namespace Gui { diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index ec7407125..cccc19b63 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include "PropertyItem.h" diff --git a/src/Gui/propertyeditor/PropertyItem.h b/src/Gui/propertyeditor/PropertyItem.h index a17858964..f8114960f 100644 --- a/src/Gui/propertyeditor/PropertyItem.h +++ b/src/Gui/propertyeditor/PropertyItem.h @@ -33,15 +33,16 @@ #include #include #include +#include #include #include #include -#include Q_DECLARE_METATYPE(Base::Vector3f) Q_DECLARE_METATYPE(Base::Vector3d) Q_DECLARE_METATYPE(Base::Matrix4D) Q_DECLARE_METATYPE(Base::Placement) +Q_DECLARE_METATYPE(Base::Quantity) namespace Gui { namespace Dialog { class TaskPlacement; }