mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-27 16:59:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(src/app/DefaultTranslator): handle correcty extra selectors

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-21 10:25:38 +01:00
parent 64e54ca6cb
commit 66662eeb79
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linphone-desktop/src/app/App.cpp
View file

@ -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();

6
linphone-desktop/src/app/DefaultTranslator.cpp
View file

@ -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