diff --git a/ObjectTypes/Light/LightWidget.hh b/ObjectTypes/Light/LightWidget.hh index 3a1f884e87f2ff16a6fe0a100432d7d3a6c5a69a..6790d76632cc4764ddeb5427a260d4ff13e0e363 100644 --- a/ObjectTypes/Light/LightWidget.hh +++ b/ObjectTypes/Light/LightWidget.hh @@ -49,11 +49,9 @@ #include #include -#if QT_VERSION >= 0x050000 - #include -#else - #include -#endif + + +#include #include diff --git a/Plugin-TypeLight/TypeLight.cc b/Plugin-TypeLight/TypeLight.cc index 0712e624d9817835f8479cc393e5f904fefe03e0..87be83f221780c95a8fece5c3d3c7b3644be4061 100644 --- a/Plugin-TypeLight/TypeLight.cc +++ b/Plugin-TypeLight/TypeLight.cc @@ -827,7 +827,3 @@ void TypeLightPlugin::updateLights() { transVec_ = ACG::Vec3d(0.0); } -#if QT_VERSION < 0x050000 - Q_EXPORT_PLUGIN2( typelightplugin , TypeLightPlugin ); -#endif - diff --git a/Plugin-TypeLight/TypeLight.hh b/Plugin-TypeLight/TypeLight.hh index e6a12dc112543fd6457e8ea77b89ecb744116fcf..8b4824ebc61a994138bb11ff9cd6b0a0d2d90b63 100644 --- a/Plugin-TypeLight/TypeLight.hh +++ b/Plugin-TypeLight/TypeLight.hh @@ -77,9 +77,7 @@ class TypeLightPlugin : public QObject, BaseInterface, LoadSaveInterface, Loggin Q_INTERFACES(ToolbarInterface) Q_INTERFACES(PickingInterface) -#if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-TypeLight") -#endif signals: // Logging interface