vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Dec 28 16:41:23 2016 +0100| [494d36c4102dd9c55af868494daceb2bd18180c0] | committer: Hugo Beauzée-Luyssen
main_interface_win32: Fix missing taskbar icons Fix #14003 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=494d36c4102dd9c55af868494daceb2bd18180c0 --- modules/gui/qt/main_interface.hpp | 3 +++ modules/gui/qt/main_interface_win32.cpp | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/modules/gui/qt/main_interface.hpp b/modules/gui/qt/main_interface.hpp index f1b2202..5a13733 100644 --- a/modules/gui/qt/main_interface.hpp +++ b/modules/gui/qt/main_interface.hpp @@ -93,6 +93,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 void changeEvent( QEvent * ) Q_DECL_OVERRIDE; diff --git a/modules/gui/qt/main_interface_win32.cpp b/modules/gui/qt/main_interface_win32.cpp index 7deb702..71772dd 100644 --- a/modules/gui/qt/main_interface_win32.cpp +++ b/modules/gui/qt/main_interface_win32.cpp @@ -197,6 +197,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
