Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
2bffc30f
Commit
2bffc30f
authored
4 years ago
by
Aline Gondim Santos
Browse files
Options
Downloads
Patches
Plain Diff
fix windows build
Change-Id: Ie03359a3550c39e9d223e4e8aee2bcc664d454aa
parent
f1963250
Branches
Branches containing commit
No related tags found
Loading
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+11
-5
11 additions, 5 deletions
CMakeLists.txt
src/qtwrapper/CMakeLists.txt
+6
-0
6 additions, 0 deletions
src/qtwrapper/CMakeLists.txt
src/qtwrapper/pluginmanager_wrap.h
+56
-2
56 additions, 2 deletions
src/qtwrapper/pluginmanager_wrap.h
with
73 additions
and
7 deletions
CMakeLists.txt
+
11
−
5
View file @
2bffc30f
...
@@ -81,6 +81,13 @@ FIND_PACKAGE(Qt5LinguistTools) # translations
...
@@ -81,6 +81,13 @@ FIND_PACKAGE(Qt5LinguistTools) # translations
FIND_PACKAGE
(
Qt5Sql REQUIRED
)
FIND_PACKAGE
(
Qt5Sql REQUIRED
)
FIND_PACKAGE
(
Qt5Gui REQUIRED
)
FIND_PACKAGE
(
Qt5Gui REQUIRED
)
IF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
)
MESSAGE
(
STATUS
"PLUGIN enabled"
)
SET
(
ENABLE_PLUGIN 0 CACHE BOOLEAN
"Enable plugin"
)
SET
(
ENABLE_PLUGIN true
)
add_definitions
(
-DENABLE_PLUGIN=true
)
ENDIF
()
IF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
AND NOT ENABLE_LIBWRAP
)
IF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Linux"
AND NOT ENABLE_LIBWRAP
)
FIND_PACKAGE
(
Qt5DBus
)
FIND_PACKAGE
(
Qt5DBus
)
ELSE
()
ELSE
()
...
@@ -238,11 +245,10 @@ IF(NOT (${ENABLE_VIDEO} MATCHES false))
...
@@ -238,11 +245,10 @@ IF(NOT (${ENABLE_VIDEO} MATCHES false))
add_definitions
(
-DENABLE_VIDEO=true
)
add_definitions
(
-DENABLE_VIDEO=true
)
ENDIF
(
NOT
(
${
ENABLE_VIDEO
}
MATCHES false
))
ENDIF
(
NOT
(
${
ENABLE_VIDEO
}
MATCHES false
))
IF
(
NOT
(
${
ENABLE_PLUGIN
}
MATCHES false
))
IF
(
NOT
(
${
ENABLE_PLUGIN
}
MATCHES true
))
MESSAGE
(
STATUS
"PLUGIN enabled"
)
MESSAGE
(
STATUS
"PLUGIN disabled"
)
SET
(
ENABLE_PLUGIN 1 CACHE BOOLEAN
"Enable plugin"
)
SET
(
ENABLE_PLUGIN 0 CACHE BOOLEAN
"Disable plugin"
)
add_definitions
(
-DENABLE_PLUGIN=true
)
ENDIF
(
NOT
(
${
ENABLE_PLUGIN
}
MATCHES true
))
ENDIF
(
NOT
(
${
ENABLE_PLUGIN
}
MATCHES false
))
# ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=1)
# ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=1)
...
...
This diff is collapsed.
Click to expand it.
src/qtwrapper/CMakeLists.txt
+
6
−
0
View file @
2bffc30f
...
@@ -34,6 +34,12 @@ IF(NOT (${ENABLE_VIDEO} MATCHES "false"))
...
@@ -34,6 +34,12 @@ IF(NOT (${ENABLE_VIDEO} MATCHES "false"))
SET
(
ENABLE_VIDEO 1 CACHE BOOLEAN
"Enable video"
)
SET
(
ENABLE_VIDEO 1 CACHE BOOLEAN
"Enable video"
)
ENDIF
(
NOT
(
${
ENABLE_VIDEO
}
MATCHES
"false"
))
ENDIF
(
NOT
(
${
ENABLE_VIDEO
}
MATCHES
"false"
))
IF
(
NOT
(
${
ENABLE_PLUGIN
}
MATCHES
"true"
))
MESSAGE
(
"PLUGIN disabled"
)
ADD_DEFINITIONS
(
-DENABLE_PLUGIN=false
)
SET
(
ENABLE_PLUGIN 0 CACHE BOOLEAN
"Disable plugin"
)
ENDIF
(
NOT
(
${
ENABLE_PLUGIN
}
MATCHES
"true"
))
INCLUDE_DIRECTORIES
(
SYSTEM
${
Qt5Core_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
SYSTEM
${
Qt5Core_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
ring_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
ring_INCLUDE_DIRS
}
)
...
...
This diff is collapsed.
Click to expand it.
src/qtwrapper/pluginmanager_wrap.h
+
56
−
2
View file @
2bffc30f
...
@@ -27,7 +27,9 @@
...
@@ -27,7 +27,9 @@
#include
<QtCore/QTimer>
#include
<QtCore/QTimer>
#include
"typedefs.h"
#include
"typedefs.h"
#ifdef ENABLE_PLUGIN
#include
<plugin_manager_interface.h>
#include
<plugin_manager_interface.h>
#endif
#include
"conversions_wrap.hpp"
#include
"conversions_wrap.hpp"
...
@@ -46,69 +48,121 @@ public Q_SLOTS: // METHODS
...
@@ -46,69 +48,121 @@ public Q_SLOTS: // METHODS
bool
loadPlugin
(
const
QString
&
path
)
bool
loadPlugin
(
const
QString
&
path
)
{
{
#ifdef ENABLE_PLUGIN
return
DRing
::
loadPlugin
(
path
.
toStdString
());
return
DRing
::
loadPlugin
(
path
.
toStdString
());
#else
return
false
;
#endif
}
}
bool
unloadPlugin
(
const
QString
&
path
)
bool
unloadPlugin
(
const
QString
&
path
)
{
{
#ifdef ENABLE_PLUGIN
return
DRing
::
unloadPlugin
(
path
.
toStdString
());
return
DRing
::
unloadPlugin
(
path
.
toStdString
());
#else
return
false
;
#endif
}
}
MapStringString
getPluginDetails
(
const
QString
&
path
)
MapStringString
getPluginDetails
(
const
QString
&
path
)
{
{
MapStringString
temp
=
#ifdef ENABLE_PLUGIN
convertMap
(
DRing
::
getPluginDetails
(
path
.
toStdString
()));
return
convertMap
(
DRing
::
getPluginDetails
(
path
.
toStdString
()));
#else
MapStringString
temp
;
return
temp
;
return
temp
;
#endif
}
}
QStringList
listAvailablePlugins
()
QStringList
listAvailablePlugins
()
{
{
#ifdef ENABLE_PLUGIN
return
convertStringList
(
DRing
::
listAvailablePlugins
());
return
convertStringList
(
DRing
::
listAvailablePlugins
());
#else
QStringList
temp
;
return
temp
;
#endif
}
}
QStringList
listLoadedPlugins
()
QStringList
listLoadedPlugins
()
{
{
#ifdef ENABLE_PLUGIN
return
convertStringList
(
DRing
::
listLoadedPlugins
());
return
convertStringList
(
DRing
::
listLoadedPlugins
());
#else
QStringList
temp
;
return
temp
;
#endif
}
}
int
installPlugin
(
const
QString
&
jplPath
,
bool
force
)
int
installPlugin
(
const
QString
&
jplPath
,
bool
force
)
{
{
#ifdef ENABLE_PLUGIN
return
DRing
::
installPlugin
(
jplPath
.
toStdString
(),
force
);
return
DRing
::
installPlugin
(
jplPath
.
toStdString
(),
force
);
#else
return
0
;
#endif
}
}
int
uninstallPlugin
(
const
QString
&
pluginRootPath
)
int
uninstallPlugin
(
const
QString
&
pluginRootPath
)
{
{
#ifdef ENABLE_PLUGIN
return
DRing
::
uninstallPlugin
(
pluginRootPath
.
toStdString
());
return
DRing
::
uninstallPlugin
(
pluginRootPath
.
toStdString
());
#else
return
0
;
#endif
}
}
QStringList
listCallMediaHandlers
()
QStringList
listCallMediaHandlers
()
{
{
#ifdef ENABLE_PLUGIN
return
convertStringList
(
DRing
::
listCallMediaHandlers
());
return
convertStringList
(
DRing
::
listCallMediaHandlers
());
#else
QStringList
temp
;
return
temp
;
#endif
}
}
void
toggleCallMediaHandler
(
const
QString
&
id
,
bool
toggle
)
void
toggleCallMediaHandler
(
const
QString
&
id
,
bool
toggle
)
{
{
#ifdef ENABLE_PLUGIN
DRing
::
toggleCallMediaHandler
(
id
.
toStdString
(),
toggle
);
DRing
::
toggleCallMediaHandler
(
id
.
toStdString
(),
toggle
);
#endif
}
}
MapStringString
getCallMediaHandlerStatus
()
MapStringString
getCallMediaHandlerStatus
()
{
{
#ifdef ENABLE_PLUGIN
return
convertMap
(
DRing
::
getCallMediaHandlerStatus
());
return
convertMap
(
DRing
::
getCallMediaHandlerStatus
());
#else
MapStringString
temp
;
return
temp
;
#endif
}
}
MapStringString
getCallMediaHandlerDetails
(
const
QString
&
id
)
MapStringString
getCallMediaHandlerDetails
(
const
QString
&
id
)
{
{
#ifdef ENABLE_PLUGIN
return
convertMap
(
DRing
::
getCallMediaHandlerDetails
(
id
.
toStdString
()));
return
convertMap
(
DRing
::
getCallMediaHandlerDetails
(
id
.
toStdString
()));
#else
MapStringString
temp
;
return
temp
;
#endif
}
}
void
setPluginsEnabled
(
bool
enable
)
void
setPluginsEnabled
(
bool
enable
)
{
{
#ifdef ENABLE_PLUGIN
DRing
::
setPluginsEnabled
(
enable
);
DRing
::
setPluginsEnabled
(
enable
);
#endif
}
}
bool
getPluginsEnabled
()
bool
getPluginsEnabled
()
{
{
#ifdef ENABLE_PLUGIN
return
DRing
::
getPluginsEnabled
();
return
DRing
::
getPluginsEnabled
();
#else
return
false
;
#endif
}
}
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment