[vlc-devel] [PATCH 4/5] Revert "Qt: Fix building with Qt < 5.7 after 691c674bfff"

Martin Storsjö martin at martin.st
Fri Jun 15 16:53:42 CEST 2018


This reverts commit 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 a27f959..c791d3d 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(nullptr)
+    : QAction()
 {
     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>"), nullptr );
+    QAction *action = new QAction( qtr("<Local>") );
     action->setCheckable(true);
     addAction( action );
     group->addAction(action);
-- 
2.7.4



More information about the vlc-devel mailing list