Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-gui
Commits
5bab2477
Commit
5bab2477
authored
Feb 12, 2018
by
Joseph Mirabel
Committed by
Joseph Mirabel
Feb 12, 2018
Browse files
[WIP] Fix hppcorbaserverplugin for compatibility with Qt5
parent
256e0e06
Changes
3
Hide whitespace changes
Inline
Side-by-side
plugins/hppcorbaserverplugin/CMakeLists.txt
View file @
5bab2477
...
...
@@ -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
View file @
5bab2477
...
...
@@ -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
View file @
5bab2477
...
...
@@ -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
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment