diff --git a/ffmpeglauncher.cpp b/ffmpeglauncher.cpp index 457da69..d1716c1 100644 --- a/ffmpeglauncher.cpp +++ b/ffmpeglauncher.cpp @@ -53,14 +53,15 @@ FfmpegLauncher::FfmpegLauncher(PlayerWatcher &watcher, QObject *parent) connect(&watcher, &PlayerWatcher::playbackStopped, this, &FfmpegLauncher::stopFfmpeg); connect(m_ffmpeg, &QProcess::started, this, &FfmpegLauncher::ffmpegStarted); connect(m_ffmpeg, -#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) || QT_DEPRECATED_SINCE(5, 6) - static_cast( +#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) || (QT_DEPRECATED_SINCE(5, 6) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + static_cast( #endif - &QProcess::error -#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) || QT_DEPRECATED_SINCE(5, 6) - ) + &QProcess::error +#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) || (QT_DEPRECATED_SINCE(5, 6) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + ) #endif - , this, &FfmpegLauncher::ffmpegError); + , + this, &FfmpegLauncher::ffmpegError); connect(m_ffmpeg, static_cast(&QProcess::finished), this, &FfmpegLauncher::ffmpegFinished); m_ffmpeg->setProgram(QStringLiteral("ffmpeg")); m_ffmpeg->setProcessChannelMode(QProcess::ForwardedChannels); diff --git a/ffmpeglauncher.h b/ffmpeglauncher.h index a9fdc8a..4c5f547 100644 --- a/ffmpeglauncher.h +++ b/ffmpeglauncher.h @@ -45,7 +45,7 @@ inline void FfmpegLauncher::setSink(const QString &sinkName) inline void FfmpegLauncher::setFFmpegInputOptions(const QString &options) { - m_inputOptions = options.split(QChar(' '), QString::SkipEmptyParts); + m_inputOptions = options.split(QChar(' '), Qt::SkipEmptyParts); } inline void FfmpegLauncher::setFFmpegBinary(const QString &path) @@ -55,7 +55,7 @@ inline void FfmpegLauncher::setFFmpegBinary(const QString &path) inline void FfmpegLauncher::setFFmpegOptions(const QString &options) { - m_options = options.split(QChar(' '), QString::SkipEmptyParts); + m_options = options.split(QChar(' '), Qt::SkipEmptyParts); } inline void FfmpegLauncher::setTargetDir(const QString &path)