vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Dec 28 16:41:23 2016 +0100| [8fac54469556b42206c6d5447c6aa14e07852e01] | committer: Jean-Baptiste Kempf
main_interface_win32: Fix missing taskbar icons Fix #14003 (cherry picked from commit 494d36c4102dd9c55af868494daceb2bd18180c0) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8fac54469556b42206c6d5447c6aa14e07852e01 --- modules/gui/qt4/main_interface.hpp | 3 +++ modules/gui/qt4/main_interface_win32.cpp | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp index 85967f7..eed3cba 100644 --- a/modules/gui/qt4/main_interface.hpp +++ b/modules/gui/qt4/main_interface.hpp @@ -95,6 +95,9 @@ protected: void dropEventPlay( QDropEvent* event, bool b_play ) { dropEventPlay(event, b_play, true); } void dropEventPlay( QDropEvent *, bool, bool ); #ifdef _WIN32 +#if HAS_QT5 + virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result); +#endif virtual bool winEvent( MSG *, long * ); #endif virtual void changeEvent( QEvent * ); diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp index 19269f7..e4aed42 100644 --- a/modules/gui/qt4/main_interface_win32.cpp +++ b/modules/gui/qt4/main_interface_win32.cpp @@ -196,6 +196,13 @@ void MainInterface::createTaskBarButtons() this, changeThumbbarButtons( int ) ); } +#if HAS_QT5 +bool MainInterface::nativeEvent(const QByteArray &, void *message, long *result) +{ + return winEvent( static_cast<MSG*>( message ), result ); +} +#endif + bool MainInterface::winEvent ( MSG * msg, long * result ) { if (msg->message == taskbar_wmsg) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
