[vlc-commits] Qt: Fix Qt4 build
Hugo Beauzée-Luyssen
git at videolan.org
Thu Jan 12 10:40:10 CET 2017
vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Jan 12 09:58:57 2017 +0100| [37ba0a26dc300708c21c73cb92ae3e6a61b93e06] | committer: Hugo Beauzée-Luyssen
Qt: Fix Qt4 build
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=37ba0a26dc300708c21c73cb92ae3e6a61b93e06
---
modules/gui/qt/components/epg/EPGProgram.cpp | 2 +-
modules/gui/qt/dialogs_provider.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt/components/epg/EPGProgram.cpp b/modules/gui/qt/components/epg/EPGProgram.cpp
index c65f2ee..aad5dd1 100644
--- a/modules/gui/qt/components/epg/EPGProgram.cpp
+++ b/modules/gui/qt/components/epg/EPGProgram.cpp
@@ -66,7 +66,7 @@ void EPGProgram::setPosition( size_t i )
void EPGProgram::activate()
{
- view->programActivated( sourceid );
+ view->activateProgram( sourceid );
}
void EPGProgram::pruneEvents( const QDateTime &date )
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 76b8c02..aa8b023 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -62,6 +62,7 @@
#include <QApplication>
#include <QSignalMapper>
#include <QFileDialog>
+#include <QUrl>
#define I_OP_DIR_WINTITLE I_DIR_OR_FOLDER( N_("Open Directory"), \
N_("Open Folder") )
@@ -125,7 +126,7 @@ QStringList DialogsProvider::getOpenURL( intf_thread_t* p_intf, QWidget *parent,
res.append( url.toEncoded() );
#else
QStringList files = QFileDialog::getOpenFileNames( parent, caption, dir, filter, selectedFilter );
- foreach ( const QString& file : files )
+ foreach ( const QString& file, files )
res.append( toURI( toNativeSeparators( file ) ) );
#endif
More information about the vlc-commits
mailing list