Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtWebEngine
Commits
7c0f4b24
Commit
7c0f4b24
authored
11 years ago
by
Zeno Albisser
Browse files
Options
Download
Patches
Plain Diff
Notify the NativeViewContainer when the QQuickNativeView is being destroyed.
parent
658354db
dev
0.9
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.15.3
5.15.4
5.15.5
5.15.6
5.15.7
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
wip/47-based
wip/qtpdf
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v0.1.0-tp1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
shared/native_view_container_qt.h
+6
-1
shared/native_view_container_qt.h
with
6 additions
and
1 deletion
shared/native_view_container_qt.h
+
6
−
1
View file @
7c0f4b24
...
@@ -65,6 +65,7 @@ public:
...
@@ -65,6 +65,7 @@ public:
{
{
if
(
m_isQQuick
)
{
if
(
m_isQQuick
)
{
insert
(
new
QQuickNativeView
(
renderWidgetHostView
));
insert
(
new
QQuickNativeView
(
renderWidgetHostView
));
connect
(
m_currentQQuickNativeView
,
SIGNAL
(
destroyed
(
QObject
*
)),
this
,
SLOT
(
destroyedNativeView
(
QObject
*
)));
return
m_currentQQuickNativeView
;
return
m_currentQQuickNativeView
;
}
}
...
@@ -82,7 +83,6 @@ protected:
...
@@ -82,7 +83,6 @@ protected:
void
insert
(
QQuickNativeView
*
nativeView
)
void
insert
(
QQuickNativeView
*
nativeView
)
{
{
fprintf
(
stderr
,
"replace: %p with %p
\n
"
,
m_currentQQuickNativeView
,
nativeView
);
if
(
m_currentQQuickNativeView
)
if
(
m_currentQQuickNativeView
)
m_currentQQuickNativeView
->
setParentItem
(
0
);
m_currentQQuickNativeView
->
setParentItem
(
0
);
...
@@ -101,6 +101,11 @@ public Q_SLOTS:
...
@@ -101,6 +101,11 @@ public Q_SLOTS:
m_currentQQuickNativeView
->
resize
(
w
,
h
);
m_currentQQuickNativeView
->
resize
(
w
,
h
);
}
}
void
destroyedNativeView
(
QObject
*
nativeView
)
{
m_currentQQuickNativeView
=
0
;
}
private
:
private
:
QObject
*
m_embeddable
;
QObject
*
m_embeddable
;
QWidgetNativeView
*
m_currentQWidgetNativeView
;
QWidgetNativeView
*
m_currentQWidgetNativeView
;
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets