vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Jan 18 15:42:44 2017 +0100| [84012eef99bbb2a3dc25ba77294c7e3d269a53a6] | committer: Hugo Beauzée-Luyssen
qt: Remove HAS_QT52 We require Qt >= 5.2 when building with Qt5, so HAS_QT5 is equivalent to HAS_QT52 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84012eef99bbb2a3dc25ba77294c7e3d269a53a6 --- modules/gui/qt/components/open_panels.cpp | 2 +- modules/gui/qt/dialogs_provider.cpp | 4 ++-- modules/gui/qt/qt.hpp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt/components/open_panels.cpp b/modules/gui/qt/components/open_panels.cpp index ec86937..6f8933f 100644 --- a/modules/gui/qt/components/open_panels.cpp +++ b/modules/gui/qt/components/open_panels.cpp @@ -273,7 +273,7 @@ void FileOpenPanel::updateMRL() } else { -#if HAS_QT52 +#if HAS_QT5 QList<QUrl> urls = dialogBox->selectedUrls(); foreach( const QUrl &url, urls ) fileList.append( url.toEncoded() ); diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp index aa8b023..467da3d 100644 --- a/modules/gui/qt/dialogs_provider.cpp +++ b/modules/gui/qt/dialogs_provider.cpp @@ -119,7 +119,7 @@ QStringList DialogsProvider::getOpenURL( intf_thread_t* p_intf, QWidget *parent, { QStringList res; -#if HAS_QT52 +#if HAS_QT5 QList<QUrl> urls = QFileDialog::getOpenFileUrls( parent, caption, QUrl::fromUserInput( dir ), filter, selectedFilter ); foreach( const QUrl& url, urls ) @@ -139,7 +139,7 @@ QString DialogsProvider::getSaveFileName( QWidget *parent, const QString &filter, QString *selectedFilter ) { -#if HAS_QT52 +#if HAS_QT5 QUrl url = QFileDialog::getSaveFileUrl( parent, caption, QUrl::fromUserInput( dir ), filter, selectedFilter ); return QString( url.toEncoded() ); #else diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp index b666cbb..99ce132 100644 --- a/modules/gui/qt/qt.hpp +++ b/modules/gui/qt/qt.hpp @@ -47,7 +47,6 @@ #endif #define HAS_QT5 ( QT_VERSION >= 0x050000 ) -#define HAS_QT52 ( QT_VERSION >= 0x050200 ) #define HAS_QT56 ( QT_VERSION >= 0x050600 ) /* Q_DECL_OVERRIDE is a Qt5 feature, add empty define to not break with Qt4 */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
