[vlc-commits] Revert "Qt: Fix building with Qt < 5.7 after 691c674bfff"

Martin Storsjö git at videolan.org
Sat Jun 16 15:59:28 CEST 2018


vlc | branch: master | Martin Storsjö <martin at martin.st> | Fri Jun 15 10:46:47 2018 +0300| [011a8fc8f487b49ed843252b237b76ac05bf9134] | committer: Martin Storsjö

Revert "Qt: Fix building with Qt < 5.7 after 691c674bfff"

This reverts commit 1e979be2dde86f1a2468e2ca98ef7fd3dbe4c265.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=011a8fc8f487b49ed843252b237b76ac05bf9134
---

 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 a27f959ad3..c791d3da97 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);



More information about the vlc-commits mailing list