Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
05b30079
Commit
05b30079
authored
Jul 28, 2015
by
Hannes Domani
Committed by
Jean-Baptiste Kempf
Jul 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: break circular ownership at destruction
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
1c3e3a54
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+2
-1
modules/gui/qt4/components/interface_widgets.hpp
modules/gui/qt4/components/interface_widgets.hpp
+2
-0
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
05b30079
...
@@ -486,7 +486,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
...
@@ -486,7 +486,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
speedControl
=
new
SpeedControlWidget
(
p_intf
,
this
);
speedControl
=
new
SpeedControlWidget
(
p_intf
,
this
);
speedControlMenu
=
new
QMenu
(
this
);
speedControlMenu
=
new
QMenu
(
this
);
QWidgetAction
*
widgetAction
=
new
QWidgetAction
(
speedControl
);
widgetAction
=
new
QWidgetAction
(
speedControl
);
widgetAction
->
setDefaultWidget
(
speedControl
);
widgetAction
->
setDefaultWidget
(
speedControl
);
speedControlMenu
->
addAction
(
widgetAction
);
speedControlMenu
->
addAction
(
widgetAction
);
...
@@ -502,6 +502,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
...
@@ -502,6 +502,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
SpeedLabel
::~
SpeedLabel
()
SpeedLabel
::~
SpeedLabel
()
{
{
widgetAction
->
setParent
(
this
);
delete
speedControlMenu
;
delete
speedControlMenu
;
}
}
...
...
modules/gui/qt4/components/interface_widgets.hpp
View file @
05b30079
...
@@ -47,6 +47,7 @@
...
@@ -47,6 +47,7 @@
class
QMenu
;
class
QMenu
;
class
QSlider
;
class
QSlider
;
class
QWidgetAction
;
class
SpeedControlWidget
;
class
SpeedControlWidget
;
struct
vout_window_t
;
struct
vout_window_t
;
...
@@ -232,6 +233,7 @@ private:
...
@@ -232,6 +233,7 @@ private:
QMenu
*
speedControlMenu
;
QMenu
*
speedControlMenu
;
QString
tooltipStringPattern
;
QString
tooltipStringPattern
;
SpeedControlWidget
*
speedControl
;
SpeedControlWidget
*
speedControl
;
QWidgetAction
*
widgetAction
;
};
};
/******************** Speed Control Widgets ****************/
/******************** Speed Control Widgets ****************/
...
...
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