diff --git a/ColorOptions.hh b/ColorOptions.hh index 7b6ba4243c5458f2fbb9e5e1512d98f824c429e9..148b1af2798660e7e7d14bface2942ce4ce3923e 100644 --- a/ColorOptions.hh +++ b/ColorOptions.hh @@ -41,7 +41,13 @@ \*===========================================================================*/ #include "ui_colorOptions.hh" -#include + +#if QT_VERSION >= 0x050000 + #include +#else + #include +#endif + class ColorOptions : public QWidget, public Ui::colorOptions { diff --git a/ColorPlugin.cc b/ColorPlugin.cc index 06a780312145bbe6dea0e636d8a7eb15957e25bb..a9d4752abe078efb171e3b46850a3521ad66eda6 100644 --- a/ColorPlugin.cc +++ b/ColorPlugin.cc @@ -40,7 +40,12 @@ * * \*===========================================================================*/ -#include + +#if QT_VERSION >= 0x050000 + #include +#else + #include +#endif #include "ColorPlugin.hh" @@ -633,6 +638,8 @@ std::cerr << "save to ini file\n"; _ini.add_entry("ColorPlugin","lineWidthPresentation", lineWidthPresentation_ ); } - +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2( colorplugin , ColorPlugin ); +#endif + diff --git a/ColorPlugin.hh b/ColorPlugin.hh index 10a6c5445f0979a3cf14de9b018221f22263fb15..972ad1d15e006a996b83a68a9c1ab967bb13bf7c 100644 --- a/ColorPlugin.hh +++ b/ColorPlugin.hh @@ -73,6 +73,10 @@ class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterfac Q_INTERFACES(OptionsInterface) Q_INTERFACES(INIInterface) +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Color") +#endif + signals: // BaseInterface void updateView();