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
4a2674be
Commit
4a2674be
authored
Feb 27, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/app/App): do not set parent of calls/settings windows
parent
d18c57c5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
App.cpp
linphone-desktop/src/app/App.cpp
+3
-4
belle-sip
submodules/belle-sip
+1
-1
linphone
submodules/linphone
+1
-1
No files found.
linphone-desktop/src/app/App.cpp
View file @
4a2674be
...
@@ -87,6 +87,8 @@ App::App (int &argc, char **argv) : QApplication(argc, argv) {
...
@@ -87,6 +87,8 @@ App::App (int &argc, char **argv) : QApplication(argc, argv) {
App
::~
App
()
{
App
::~
App
()
{
qInfo
()
<<
"Destroying app..."
;
qInfo
()
<<
"Destroying app..."
;
delete
m_calls_window
;
delete
m_settings_window
;
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
...
@@ -153,14 +155,13 @@ void App::initContentApp () {
...
@@ -153,14 +155,13 @@ void App::initContentApp () {
core
->
setParent
(
this
);
core
->
setParent
(
this
);
}
}
createSubWindows
();
// Load main view.
// Load main view.
qInfo
()
<<
"Loading main view..."
;
qInfo
()
<<
"Loading main view..."
;
m_engine
.
load
(
QUrl
(
QML_VIEW_MAIN_WINDOW
));
m_engine
.
load
(
QUrl
(
QML_VIEW_MAIN_WINDOW
));
if
(
m_engine
.
rootObjects
().
isEmpty
())
if
(
m_engine
.
rootObjects
().
isEmpty
())
qFatal
(
"Unable to open main window."
);
qFatal
(
"Unable to open main window."
);
createSubWindows
();
#ifndef __APPLE__
#ifndef __APPLE__
// Enable TrayIconSystem.
// Enable TrayIconSystem.
if
(
!
QSystemTrayIcon
::
isSystemTrayAvailable
())
if
(
!
QSystemTrayIcon
::
isSystemTrayAvailable
())
...
@@ -319,9 +320,7 @@ inline QQuickWindow *createSubWindow (App *app, const char *path) {
...
@@ -319,9 +320,7 @@ inline QQuickWindow *createSubWindow (App *app, const char *path) {
}
}
QQuickWindow
*
window
=
qobject_cast
<
QQuickWindow
*>
(
component
.
create
());
QQuickWindow
*
window
=
qobject_cast
<
QQuickWindow
*>
(
component
.
create
());
QQmlEngine
::
setObjectOwnership
(
window
,
QQmlEngine
::
CppOwnership
);
QQmlEngine
::
setObjectOwnership
(
window
,
QQmlEngine
::
CppOwnership
);
window
->
setParent
(
app
->
getMainWindow
());
return
window
;
return
window
;
}
}
...
...
belle-sip
@
7c5bb0a4
Subproject commit 7
3fac2d401c19c93529269665d7ed1c0ffa311d0
Subproject commit 7
c5bb0a415950fe38f0857ed02c66b65b976be28
linphone
@
17df3b86
Subproject commit
bad65fdb35b56791bd3774ded844090d3213437b
Subproject commit
17df3b86a5a931bb6c994a70e96690e3a95d49c9
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