[WIP] Fix hppcorbaserverplugin for compatibility with Qt5

plugins/hppcorbaserverplugin/CMakeLists.txt

@@ -30,12 +30,17 @@ SET(${PLUGIN_NAME}_FORMS
 SET(${PLUGIN_NAME}_RESOURCES
   )
 
-QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
-QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
-QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
+IF(USE_QT4)
+  QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
+  QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
+  QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
+  INCLUDE(${QT_USE_FILE})
+ELSE(USE_QT4)
+  QT5_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
+  QT5_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
+  QT5_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
+ENDIF(USE_QT4)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE(${QT_USE_FILE})
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 ADD_DEFINITIONS(-DQT_PLUGIN)
 ADD_DEFINITIONS(-DQT_SHARED)

plugins/hppcorbaserverplugin/hppcorbaserverplugin.cc

@@ -42,6 +42,8 @@ namespace hpp {
       return QString ("hpp-corbaserver plugin");
     }
 
+#ifdef USE_QT4
     Q_EXPORT_PLUGIN2 (hppcorbaserverplugin, HppCorbaserverPlugin)
+#endif // USE_QT4
   } // namespace gui
 } // namespace hpp

plugins/hppcorbaserverplugin/hppcorbaserverplugin.hh

@@ -15,6 +15,9 @@ namespace hpp {
     {
       Q_OBJECT
       Q_INTERFACES (gepetto::gui::PluginInterface)
+#ifndef USE_QT4
+      Q_PLUGIN_METADATA (IID "hpp-gui.hppcorbaserverplugin")
+#endif // USE_QT4
 
       public:
         explicit HppCorbaserverPlugin ();