Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
e7c60ca3
Commit
e7c60ca3
authored
Jun 27, 2017
by
Wescoeur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(App): add an import qml path for plugins
parent
73e0f0b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
App.cpp
src/app/App.cpp
+4
-1
No files found.
src/app/App.cpp
View file @
e7c60ca3
...
@@ -142,6 +142,7 @@ inline void activeSplashScreen (QQmlApplicationEngine *engine) {
...
@@ -142,6 +142,7 @@ inline void activeSplashScreen (QQmlApplicationEngine *engine) {
void
App
::
initContentApp
()
{
void
App
::
initContentApp
()
{
shared_ptr
<
linphone
::
Config
>
config
=
::
getConfigIfExists
(
*
mParser
);
shared_ptr
<
linphone
::
Config
>
config
=
::
getConfigIfExists
(
*
mParser
);
const
QString
pluginsPath
=
::
Utils
::
coreStringToAppString
(
Paths
::
getPluginsDirPath
());
// Destroy qml components and linphone core if necessary.
// Destroy qml components and linphone core if necessary.
if
(
mEngine
)
{
if
(
mEngine
)
{
...
@@ -167,7 +168,7 @@ void App::initContentApp () {
...
@@ -167,7 +168,7 @@ void App::initContentApp () {
});
});
// Add plugins directory.
// Add plugins directory.
addLibraryPath
(
::
Utils
::
coreStringToAppString
(
Paths
::
getPluginsDirPath
())
);
addLibraryPath
(
pluginsPath
);
qInfo
()
<<
QStringLiteral
(
"Library paths:"
)
<<
libraryPaths
();
qInfo
()
<<
QStringLiteral
(
"Library paths:"
)
<<
libraryPaths
();
}
}
...
@@ -185,6 +186,8 @@ void App::initContentApp () {
...
@@ -185,6 +186,8 @@ void App::initContentApp () {
mEngine
->
addImportPath
(
":/ui/modules"
);
mEngine
->
addImportPath
(
":/ui/modules"
);
mEngine
->
addImportPath
(
":/ui/scripts"
);
mEngine
->
addImportPath
(
":/ui/scripts"
);
mEngine
->
addImportPath
(
":/ui/views"
);
mEngine
->
addImportPath
(
":/ui/views"
);
mEngine
->
addImportPath
(
pluginsPath
);
qInfo
()
<<
QStringLiteral
(
"Engine import paths:"
)
<<
mEngine
->
importPathList
();
// Provide avatars/thumbnails providers.
// Provide avatars/thumbnails providers.
mEngine
->
addImageProvider
(
AvatarProvider
::
PROVIDER_ID
,
new
AvatarProvider
());
mEngine
->
addImageProvider
(
AvatarProvider
::
PROVIDER_ID
,
new
AvatarProvider
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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