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
9d40de3c
Commit
9d40de3c
authored
Feb 12, 2018
by
Joseph Mirabel
Committed by
Joseph Mirabel
Feb 12, 2018
Browse files
Use Qt version check mechanism
parent
95b33864
Changes
9
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
9d40de3c
...
...
@@ -52,7 +52,6 @@ MESSAGE(STATUS "Looking for Qt ${DESIRED_QT_VERSION_MAJOR}.")
SET
(
CMAKE_INCLUDE_CURRENT_DIR ON
)
IF
(
USE_QT4
)
FIND_PACKAGE
(
Qt4 REQUIRED QtCore QtGui QtOpenGl QtNetwork
)
ADD_DEFINITIONS
(
-DUSE_QT4
)
SET
(
PKG_CONFIG_EXTRA
"qtversion:
${
QT_VERSION_MAJOR
}
.
${
QT_VERSION_MINOR
}
.
${
QT_VERSION_PATCH
}
"
)
ELSE
(
USE_QT4
)
FOREACH
(
component
"Core"
"Widgets"
"Gui"
"OpenGL"
"Concurrent"
"Network"
)
...
...
plugins/hppcorbaserverplugin/hppcorbaserverplugin.cc
View file @
9d40de3c
...
...
@@ -42,8 +42,8 @@ namespace hpp {
return
QString
(
"hpp-corbaserver plugin"
);
}
#if
def USE_QT4
#if
(QT_VERSION < QT_VERSION_CHECK(5,0,0))
Q_EXPORT_PLUGIN2
(
hppcorbaserverplugin
,
HppCorbaserverPlugin
)
#endif
// USE_QT4
#endif
}
// namespace gui
}
// namespace hpp
plugins/hppcorbaserverplugin/hppcorbaserverplugin.hh
View file @
9d40de3c
...
...
@@ -15,9 +15,9 @@ namespace hpp {
{
Q_OBJECT
Q_INTERFACES
(
gepetto
::
gui
::
PluginInterface
)
#if
ndef USE_QT4
#if
(QT_VERSION >= QT_VERSION_CHECK(5,0,0))
Q_PLUGIN_METADATA
(
IID
"hpp-gui.hppcorbaserverplugin"
)
#endif
// USE_QT4
#endif
public:
explicit
HppCorbaserverPlugin
();
...
...
plugins/hppmanipulationwidgetsplugin/hppmanipulationwidgetsplugin.cc
View file @
9d40de3c
...
...
@@ -517,8 +517,8 @@ namespace hpp {
constraintWidget_
->
addConstraint
(
new
ManipulationLockedJoint
(
this
));
}
#if
def USE_QT4
#if
(QT_VERSION < QT_VERSION_CHECK(5,0,0))
Q_EXPORT_PLUGIN2
(
hppmanipulationwidgetsplugin
,
HppManipulationWidgetsPlugin
)
#endif
// USE_QT4
#endif
}
// namespace gui
}
// namespace hpp
plugins/hppmanipulationwidgetsplugin/hppmanipulationwidgetsplugin.hh
View file @
9d40de3c
...
...
@@ -22,9 +22,9 @@ namespace hpp {
gepetto
::
gui
::
ModelInterface
gepetto
::
gui
::
CorbaInterface
)
#if
ndef USE_QT4
#if
(QT_VERSION >= QT_VERSION_CHECK(5,0,0))
Q_PLUGIN_METADATA
(
IID
"hpp-gui.hppmanipulationwidgetsplugin"
)
#endif
// USE_QT4
#endif
public:
typedef
hpp
::
corbaServer
::
manipulation
::
Client
HppManipClient
;
...
...
plugins/hppwidgetsplugin/hppwidgetsplugin.cc
View file @
9d40de3c
...
...
@@ -549,8 +549,8 @@ namespace hpp {
return
target
;
}
#if
def USE_QT4
#if
(QT_VERSION < QT_VERSION_CHECK(5,0,0))
Q_EXPORT_PLUGIN2
(
hppwidgetsplugin
,
HppWidgetsPlugin
)
#endif
// USE_QT4
#endif
}
// namespace gui
}
// namespace hpp
plugins/hppwidgetsplugin/hppwidgetsplugin.hh
View file @
9d40de3c
...
...
@@ -25,9 +25,9 @@ namespace hpp {
gepetto
::
gui
::
ModelInterface
gepetto
::
gui
::
CorbaInterface
)
#if
ndef USE_QT4
#if
(QT_VERSION >= QT_VERSION_CHECK(5,0,0))
Q_PLUGIN_METADATA
(
IID
"hpp-gui.hppwidgetsplugin"
)
#endif
// USE_QT4
#endif
public:
struct
JointElement
{
...
...
plugins/remoteimuplugin/remoteimuplugin.cc
View file @
9d40de3c
...
...
@@ -253,8 +253,8 @@ namespace hpp {
msgBox_
->
show
();
}
#if
def USE_QT4
#if
(QT_VERSION < QT_VERSION_CHECK(5,0,0))
Q_EXPORT_PLUGIN2
(
remoteimuplugin
,
RemoteImuPlugin
)
#endif
// USE_QT4
#endif
}
// namespace gui
}
// namespace hpp
plugins/remoteimuplugin/remoteimuplugin.hh
View file @
9d40de3c
...
...
@@ -103,9 +103,9 @@ namespace hpp {
{
Q_OBJECT
Q_INTERFACES
(
gepetto
::
gui
::
PluginInterface
gepetto
::
gui
::
JointModifierInterface
)
#if
ndef USE_QT4
#if
(QT_VERSION >= QT_VERSION_CHECK(5,0,0))
Q_PLUGIN_METADATA
(
IID
"hpp-gui.remoteimuplugin"
)
#endif
// USE_QT4
#endif
public:
virtual
~
RemoteImuPlugin
();
...
...
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