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
d95f5239
Commit
d95f5239
authored
Jan 22, 2018
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(DefaultTranslator): deal with 5.9 components
parent
5dd0161a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
DefaultTranslator.cpp
src/app/translator/DefaultTranslator.cpp
+7
-3
No files found.
src/app/translator/DefaultTranslator.cpp
View file @
d95f5239
...
...
@@ -33,10 +33,13 @@ DefaultTranslator::DefaultTranslator (QObject *parent) : QTranslator(parent) {
QFileInfo
info
(
it
.
next
());
if
(
info
.
suffix
()
==
"qml"
)
{
// Ignore extra selectors.
QString
dir
=
info
.
absoluteDir
().
absolutePath
();
if
(
dir
.
contains
(
"+linux"
)
||
dir
.
contains
(
"+mac"
)
||
dir
.
contains
(
"+windows"
))
continue
;
// Ignore extra selectors.
// TODO: Remove 5.9 support in July 2018.
for
(
const
auto
&
selector
:
{
"+linux"
,
"+mac"
,
"+windows"
,
"+5.9"
})
if
(
dir
.
contains
(
selector
))
goto
end
;
// Ignore default imports.
if
(
dir
.
startsWith
(
":/QtQuick"
))
...
...
@@ -48,6 +51,7 @@ DefaultTranslator::DefaultTranslator (QObject *parent) : QTranslator(parent) {
else
mContexts
<<
basename
;
}
end:
;
}
}
...
...
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