From 66662eeb79aaf00fd8718bfb4249285d9d355ba0 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 21 Feb 2017 10:25:38 +0100
Subject: [PATCH] feat(src/app/DefaultTranslator): handle correcty extra
 selectors

---
 linphone-desktop/src/app/App.cpp               | 3 +++
 linphone-desktop/src/app/DefaultTranslator.cpp | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index da86724e7..4a9ad5fa1 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -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();
diff --git a/linphone-desktop/src/app/DefaultTranslator.cpp b/linphone-desktop/src/app/DefaultTranslator.cpp
index 85e1fc830..f6604fe1e 100644
--- a/linphone-desktop/src/app/DefaultTranslator.cpp
+++ b/linphone-desktop/src/app/DefaultTranslator.cpp
@@ -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