mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(src/app/App): do not set parent of calls/settings windows

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-27 11:33:50 +01:00
parent d18c57c5bc
commit 4a2674bebb
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 73fac2d401c19c93529269665d7ed1c0ffa311d0
Subproject commit 7c5bb0a415950fe38f0857ed02c66b65b976be28

2
submodules/linphone

@ -1 +1 @@
Subproject commit bad65fdb35b56791bd3774ded844090d3213437b
Subproject commit 17df3b86a5a931bb6c994a70e96690e3a95d49c9