vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Jan 11 11:00:00 2017 +0100| [eed1dc1ff0daee47e44c96e7045dcfdc7cbbd872] | committer: Hugo Beauzée-Luyssen
qt: Fix build when using Qt4 Fix #17864 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eed1dc1ff0daee47e44c96e7045dcfdc7cbbd872 --- modules/gui/qt/dialogs_provider.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt/dialogs_provider.hpp b/modules/gui/qt/dialogs_provider.hpp index 2055ba8..b119674 100644 --- a/modules/gui/qt/dialogs_provider.hpp +++ b/modules/gui/qt/dialogs_provider.hpp @@ -91,16 +91,16 @@ public: const QString& path = QString() ); bool isDying() { return b_isDying; } static QString getDirectoryDialog( intf_thread_t *p_intf); - static QStringList getOpenURL(intf_thread_t* p_intf, QWidget *parent = Q_NULLPTR, + static QStringList getOpenURL(intf_thread_t* p_intf, QWidget *parent = NULL, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR ); - static QString getSaveFileName( QWidget *parent = Q_NULLPTR, + QString *selectedFilter = NULL ); + static QString getSaveFileName( QWidget *parent = NULL, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = Q_NULLPTR ); + QString *selectedFilter = NULL ); protected: QSignalMapper *menusMapper; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
