[vlc-commits] Qt: Fix building with Qt < 5.7 after 691c674bfff
Martin Storsjö
git at videolan.org
Thu Jun 14 11:10:17 CEST 2018
vlc | branch: master | Martin Storsjö <martin at martin.st> | Thu Jun 14 12:09:03 2018 +0300| [1e979be2dde86f1a2468e2ca98ef7fd3dbe4c265] | committer: Martin Storsjö
Qt: Fix building with Qt < 5.7 after 691c674bfff
The parent argument to QAction constructors were made optional
in Qt 5.7, but contribs still build Qt 5.6.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e979be2dde86f1a2468e2ca98ef7fd3dbe4c265
---
modules/gui/qt/components/custom_menus.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt/components/custom_menus.cpp b/modules/gui/qt/components/custom_menus.cpp
index c791d3da97..a27f959ad3 100644
--- a/modules/gui/qt/components/custom_menus.cpp
+++ b/modules/gui/qt/components/custom_menus.cpp
@@ -37,7 +37,7 @@
#include <QProgressBar>
RendererAction::RendererAction( vlc_renderer_item_t *p_item_ )
- : QAction()
+ : QAction(nullptr)
{
p_item = p_item_;
vlc_renderer_item_hold( p_item );
@@ -66,7 +66,7 @@ RendererMenu::RendererMenu( QMenu *parent, intf_thread_t *p_intf_ )
group = new QActionGroup( this );
- QAction *action = new QAction( qtr("<Local>") );
+ QAction *action = new QAction( qtr("<Local>"), nullptr );
action->setCheckable(true);
addAction( action );
group->addAction(action);
More information about the vlc-commits
mailing list