From 6c95200b827d38f6fc7d1a0405afc2f8c32c1384 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 17 Apr 2021 21:39:38 +0000 Subject: fixed Qt 5.15 build git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9821 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp | 4 ++++ src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src/plugins') diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp index e54e35968..6f77459e0 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp @@ -448,7 +448,11 @@ void QmmpFileDialogImpl::addFiles(const QStringList &list) bool contains = false; for(const QString &str : qt_clean_filter_list(fileTypeComboBox->currentText())) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) QRegularExpression regExp(QRegularExpression::wildcardToRegularExpression(str)); +#else + QRegularExpression regExp(Qmmp::wildcardToRegularExpression(str)); +#endif if (f_name.contains(regExp)) { contains = true; diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp index 7d7b6c0cd..063f7bd21 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp @@ -431,7 +431,11 @@ void TwoPanelFileDialogImpl::addFiles(const QStringList &list, bool play) bool contains = false; for(const QString &str : qt_clean_filter_list(m_ui.fileTypeComboBox->currentText())) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) QRegularExpression regExp(QRegularExpression::wildcardToRegularExpression(str)); +#else + QRegularExpression regExp(Qmmp::wildcardToRegularExpression(str)); +#endif if (f_name.contains(regExp)) { contains = true; -- cgit v1.2.3-13-gbd6f