From 4a2674bebb35b20c385513ac560d1463e0bb7b22 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 27 Feb 2017 11:33:50 +0100
Subject: [PATCH] fix(src/app/App): do not set parent of calls/settings windows

---
 linphone-desktop/src/app/App.cpp | 7 +++----
 submodules/belle-sip             | 2 +-
 submodules/linphone              | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index d4a448950..dfdcbb677 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -87,6 +87,8 @@ App::App (int &argc, char **argv) : QApplication(argc, argv) {
 
 App::~App () {
   qInfo() << "Destroying app...";
+  delete m_calls_window;
+  delete m_settings_window;
 }
 
 // -----------------------------------------------------------------------------
@@ -153,14 +155,13 @@ void App::initContentApp () {
     core->setParent(this);
   }
 
+  createSubWindows();
   // Load main view.
   qInfo() << "Loading main view...";
   m_engine.load(QUrl(QML_VIEW_MAIN_WINDOW));
   if (m_engine.rootObjects().isEmpty())
     qFatal("Unable to open main window.");
 
-  createSubWindows();
-
   #ifndef __APPLE__
     // Enable TrayIconSystem.
     if (!QSystemTrayIcon::isSystemTrayAvailable())
@@ -319,9 +320,7 @@ inline QQuickWindow *createSubWindow (App *app, const char *path) {
   }
 
   QQuickWindow *window = qobject_cast<QQuickWindow *>(component.create());
-
   QQmlEngine::setObjectOwnership(window, QQmlEngine::CppOwnership);
-  window->setParent(app->getMainWindow());
 
   return window;
 }
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 73fac2d40..7c5bb0a41 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 73fac2d401c19c93529269665d7ed1c0ffa311d0
+Subproject commit 7c5bb0a415950fe38f0857ed02c66b65b976be28
diff --git a/submodules/linphone b/submodules/linphone
index bad65fdb3..17df3b86a 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit bad65fdb35b56791bd3774ded844090d3213437b
+Subproject commit 17df3b86a5a931bb6c994a70e96690e3a95d49c9