[vlc-commits] Qt: fix compilation with qt 4.7/4.8
Jean-Baptiste Kempf
git at videolan.org
Thu Jul 30 00:44:46 CEST 2015
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul 30 00:44:34 2015 +0200| [48b99150f8e7f993f1a350082e96f00a4d766cd8] | committer: Jean-Baptiste Kempf
Qt: fix compilation with qt 4.7/4.8
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=48b99150f8e7f993f1a350082e96f00a4d766cd8
---
modules/gui/qt4/dialogs/messages.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 1bb777c..52c45d8 100644
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -340,7 +340,11 @@ void MessagesDialog::MsgCallback( void *self, int type, const vlc_log_t *item,
{
MessagesDialog *dialog = (MessagesDialog *)self;
char *str;
+#if HAS_QT5
int verbosity = dialog->verbosity.load();
+#else
+ int verbosity = dialog->verbosity;
+#endif
if( verbosity < 0 || verbosity < (type - VLC_MSG_ERR)
|| unlikely(vasprintf( &str, format, ap ) == -1) )
More information about the vlc-commits
mailing list