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
66662eeb
Commit
66662eeb
authored
Feb 21, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(src/app/DefaultTranslator): handle correcty extra selectors
parent
64e54ca6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
App.cpp
linphone-desktop/src/app/App.cpp
+3
-0
DefaultTranslator.cpp
linphone-desktop/src/app/DefaultTranslator.cpp
+5
-1
No files found.
linphone-desktop/src/app/App.cpp
View file @
66662eeb
...
...
@@ -32,6 +32,7 @@
#include "App.hpp"
#include <QFileSelector>
#include <QMenu>
#include <QQmlComponent>
#include <QQmlContext>
...
...
@@ -114,6 +115,8 @@ void App::initContentApp () {
CoreManager
::
init
();
qInfo
()
<<
"Core manager initialized."
;
qInfo
()
<<
"Activated selectors:"
<<
QQmlFileSelector
::
get
(
&
m_engine
)
->
selector
()
->
allSelectors
();
// Register types ans make sub windows.
registerTypes
();
createSubWindows
();
...
...
linphone-desktop/src/app/DefaultTranslator.cpp
View file @
66662eeb
...
...
@@ -33,8 +33,12 @@ DefaultTranslator::DefaultTranslator () {
QFileInfo
info
(
it
.
next
());
if
(
info
.
suffix
()
==
"qml"
)
{
QString
basename
=
info
.
baseName
();
// Ignore extra selectors.
QString
dir
=
info
.
absoluteDir
().
dirName
();
if
(
dir
==
"+linux"
||
dir
==
"+mac"
||
dir
==
"+windows"
)
continue
;
QString
basename
=
info
.
baseName
();
if
(
m_contexts
.
contains
(
basename
))
qWarning
()
<<
QStringLiteral
(
"QML context `%1` already exists in contexts list."
).
arg
(
basename
);
else
...
...
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