Commit 626efbc7 authored by Jan Möbius's avatar Jan Möbius
Browse files

Qt5 compatibility fixes

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@17591 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 67a78eac
...@@ -135,6 +135,6 @@ void PanoramaControlPlugin::slotValuesChanged(double) { ...@@ -135,6 +135,6 @@ void PanoramaControlPlugin::slotValuesChanged(double) {
emit updateView(); emit updateView();
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( panoramacontrolplugin , PanoramaControlPlugin ); Q_EXPORT_PLUGIN2( panoramacontrolplugin , PanoramaControlPlugin );
#endif
...@@ -60,6 +60,10 @@ Q_INTERFACES(ToolboxInterface) ...@@ -60,6 +60,10 @@ Q_INTERFACES(ToolboxInterface)
Q_INTERFACES(LoggingInterface) Q_INTERFACES(LoggingInterface)
Q_INTERFACES(LoadSaveInterface) Q_INTERFACES(LoadSaveInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-PanoramaControl")
#endif
signals: signals:
//BaseInterface //BaseInterface
......
...@@ -268,6 +268,6 @@ void PoissonPlugin::slotPoissonReconstruct(){ ...@@ -268,6 +268,6 @@ void PoissonPlugin::slotPoissonReconstruct(){
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( poissonplugin , PoissonPlugin ); Q_EXPORT_PLUGIN2( poissonplugin , PoissonPlugin );
#endif
...@@ -62,6 +62,10 @@ Q_INTERFACES(LoggingInterface) ...@@ -62,6 +62,10 @@ Q_INTERFACES(LoggingInterface)
Q_INTERFACES(LoadSaveInterface) Q_INTERFACES(LoadSaveInterface)
Q_INTERFACES(AboutInfoInterface) Q_INTERFACES(AboutInfoInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-PoissonReconstruction")
#endif
signals: signals:
//BaseInterface //BaseInterface
......
...@@ -81,5 +81,6 @@ int TypeSkyDomePlugin::addEmpty(){ ...@@ -81,5 +81,6 @@ int TypeSkyDomePlugin::addEmpty(){
return object->id(); return object->id();
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( typeskydomeplugin , TypeSkyDomePlugin ); Q_EXPORT_PLUGIN2( typeskydomeplugin , TypeSkyDomePlugin );
#endif
...@@ -59,6 +59,10 @@ class TypeSkyDomePlugin : public QObject, BaseInterface, LoadSaveInterface, Logg ...@@ -59,6 +59,10 @@ class TypeSkyDomePlugin : public QObject, BaseInterface, LoadSaveInterface, Logg
Q_INTERFACES(LoggingInterface) Q_INTERFACES(LoggingInterface)
Q_INTERFACES(TypeInterface) Q_INTERFACES(TypeInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-TypeSkyDome")
#endif
signals: signals:
// Logging interface // Logging interface
void log(Logtype _type, QString _message); void log(Logtype _type, QString _message);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment