Commit 982f547c authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents 34b1d26d 046665f3
Pipeline #195820 passed with stage
in 6 minutes and 55 seconds
......@@ -53,6 +53,9 @@ include(ECMAddQch)
if (ECM_VERSION VERSION_GREATER_EQUAL "5.89.0")
include(QtVersionOption)
endif()
if (ECM_VERSION VERSION_GREATER_EQUAL "5.91.0")
include(ECMDeprecationSettings)
endif()
add_definitions(-DTRANSLATION_DOMAIN=\"kdenlive\")
find_package(KF5 ${KF_DEP_VERSION} REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets
......@@ -65,6 +68,14 @@ if (NOT DEFINED QT_MAJOR_VERSION)
set(QT_MAJOR_VERSION 5)
endif()
if (ECM_VERSION VERSION_GREATER_EQUAL "5.91.0")
ecm_set_disabled_deprecation_versions(SHOW_DEPRECATIONS
#QT ${QT_MIN_VERSION} // causes problems with QVariant, disable for know
KF ${KF_DEP_VERSION}
)
endif()
find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Core Widgets Svg Quick QuickControls2 Concurrent QuickWidgets Multimedia NetworkAuth)
if (QT_MAJOR_VERSION STREQUAL "6")
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS SvgWidgets)
......@@ -74,7 +85,6 @@ if(NOT NODBUS)
find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS DBus)
endif()
add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_URL_CAST_FROM_STRING)
#add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F02)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt${QT_MAJOR_VERSION}Widgets_EXECUTABLE_COMPILE_FLAGS}")
# MLT
......
......@@ -10,6 +10,9 @@
#include "mainwindow.h"
#include "mltconnection.h"
#include <QDirIterator>
#include <QFileDialog>
UrlListParamWidget::UrlListParamWidget(std::shared_ptr<AssetParameterModel> model, QModelIndex index, QWidget *parent)
: AbstractParamWidget(std::move(model), index, parent)
, m_isLumaList(false)
......
......@@ -45,7 +45,7 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include "undohelper.hpp"
#include "xml/xml.hpp"
#include <dialogs/textbasededit.h>
#include <memory>
#include <jobs/audiolevelstask.h>
#include <profiles/profilemodel.hpp>
#include <utils/thumbnailcache.hpp>
......@@ -67,13 +67,16 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <QDrag>
#include <QFile>
#include <QMenu>
#include <QMimeData>
#include <QSlider>
#include <QStyledItemDelegate>
#include <QTimeLine>
#include <QToolBar>
#include <QUndoCommand>
#include <QUrl>
#include <QVBoxLayout>
#include <jobs/audiolevelstask.h>
#include <memory>
#include <utility>
static QImage m_videoIcon;
......
......@@ -25,7 +25,6 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <QUrl>
#include <QWidget>
#include <QActionGroup>
#include <QtWidgets>
#include "KFileWidget"
#include "KRecentDirs"
......
......@@ -31,13 +31,11 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include "projectsubclip.h"
#include "timeline2/model/snapmodel.hpp"
#include "utils/timecode.h"
#include "utils/thumbnailcache.hpp"
#include "xml/xml.hpp"
#include <QPainter>
#include <kimagecache.h>
#include "kdenlive_debug.h"
#include <KImageCache>
#include <KLocalizedString>
#include <KMessageBox>
#include <QApplication>
......@@ -45,6 +43,12 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <QDir>
#include <QDomElement>
#include <QFile>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QPainter>
#include <QProcess>
#include <QtMath>
#ifdef CRASH_AUTO_TEST
#include "logger.hpp"
......
......@@ -27,8 +27,12 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KLocalizedString>
#include <QIcon>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QMimeData>
#include <QProgressDialog>
#include <mlt++/Mlt.h>
#include <queue>
#include <qvarlengtharray.h>
......
......@@ -19,6 +19,7 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KLocalizedString>
#include <QDomElement>
#include <QPainter>
#include <QtMath>
#include <utility>
class ClipController;
......
......@@ -25,10 +25,10 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include "widgets/timecodedisplay.h"
#include "xml/xml.hpp"
#include "klocalizedstring.h"
#include <KDirOperator>
#include <KFileWidget>
#include <KIO/RenameDialog>
#include <KLocalizedString>
#include <KMessageBox>
#include <KRecentDirs>
#include <KWindowConfig>
......@@ -37,10 +37,12 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <QDir>
#include <QMimeDatabase>
#include <QPointer>
#include <QProcess>
#include <QPushButton>
#include <QStandardPaths>
#include <QUndoCommand>
#include <QWindow>
#include <unordered_map>
#include <utility>
......
......@@ -25,16 +25,14 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include "capture/v4lcapture.h"
#endif
#include "KLocalizedString"
#include "kdenlive_debug.h"
#include "klocalizedstring.h"
#include <KIO/DesktopExecParser>
#include <kio_version.h>
#include <KIO/OpenUrlJob>
#include <KArchive>
#include <KArchiveDirectory>
#include <KIO/DesktopExecParser>
#include <KIO/FileCopyJob>
#include <KIO/JobUiDelegate>
#include <KIO/OpenUrlJob>
#include <KLineEdit>
#include <KMessageBox>
#include <KOpenWithDialog>
......@@ -42,15 +40,19 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KTar>
#include <KUrlRequesterDialog>
#include <KZip>
#include <kio_version.h>
#include <QAction>
#include <QDir>
#include <QGuiApplication>
#include <QInputDialog>
#include <QRegularExpression>
#include <QScreen>
#include <QSize>
#include <QThread>
#include <QTimer>
#include <QtConcurrent>
#include <cstdio>
#include <cstdlib>
#include <fcntl.h>
......
......@@ -22,13 +22,13 @@
#include "renderpresets/renderpresetmodel.hpp"
#include "renderpresets/renderpresetrepository.hpp"
#include "klocalizedstring.h"
#include <KColorScheme>
#include <KIO/DesktopExecParser>
#include <KIO/OpenFileManagerWindowJob>
#include <KIO/OpenUrlJob>
#include <KLocalizedString>
#include <KMessageBox>
#include <KNotification>
#include <KRun>
#include <kio_version.h>
#include <knotifications_version.h>
......@@ -45,12 +45,14 @@
#include <QMenu>
#include <QMimeDatabase>
#include <QProcess>
#include <QScreen>
#include <QScrollBar>
#include <QStandardPaths>
#include <QString>
#include <QTemporaryFile>
#include <QThread>
#include <QTreeWidgetItem>
#include <qglobal.h>
#include <qstring.h>
#include <QtGlobal>
#ifdef KF5_USE_PURPOSE
#include <Purpose/AlternativesModel>
......@@ -1951,7 +1953,7 @@ void RenderWidget::slotPlayRendering(QTreeWidgetItem *item, int)
if (renderItem->status() != FINISHEDJOB) {
return;
}
new KRun(QUrl::fromLocalFile(item->text(1)), this);
KIO::OpenUrlJob(QUrl::fromLocalFile(item->text(1)));
}
void RenderWidget::errorMessage(RenderError type, const QString &message)
......
......@@ -19,9 +19,11 @@
#include <KLocalizedString>
#include <KMessageWidget>
#include <QButtonGroup>
#include <QDir>
#include <QFontDatabase>
#include <QProcess>
#include <memory>
#include <utility>
......
......@@ -15,17 +15,26 @@
#include "timeline2/view/timelinecontroller.h"
#include "timeline2/view/timelinewidget.h"
#include "widgets/timecodedisplay.h"
#include <memory>
#include <profiles/profilemodel.hpp>
#include "klocalizedstring.h"
#include <KLocalizedString>
#include <KMessageBox>
#include <KUrlRequesterDialog>
#include <QAbstractTextDocumentLayout>
#include <QEvent>
#include <QFontDatabase>
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonParseError>
#include <QKeyEvent>
#include <QMenu>
#include <QPainter>
#include <QScrollBar>
#include <QTextBlock>
#include <QToolButton>
#include <memory>
VideoTextEdit::VideoTextEdit(QWidget *parent)
: QTextEdit(parent)
{
......
......@@ -18,6 +18,7 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KMessageBox>
#include <klocalizedstring.h>
#include <QApplication>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
......
......@@ -35,19 +35,20 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KIO/CopyJob>
#include <KIO/FileCopyJob>
#include <KIO/JobUiDelegate>
#include <KJobWidgets/KJobWidgets>
#include <KLocalizedString>
#include <KMessageBox>
#include <klocalizedstring.h>
#include "kdenlive_debug.h"
#include <QCryptographicHash>
#include <QDomImplementation>
#include <QFile>
#include <QFileDialog>
#include <QSaveFile>
#include <QStandardPaths>
#include <QUndoGroup>
#include <QUndoStack>
#include <KJobWidgets/KJobWidgets>
#include <QStandardPaths>
#include <mlt++/Mlt.h>
#include <locale>
......
......@@ -19,6 +19,10 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include "mainwindow.h"
#include "ui_scenecutdialog_ui.h"
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QPointer>
#include <QProcess>
#include <QTemporaryFile>
#include <QThread>
......@@ -28,12 +32,14 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
SceneSplitTask::SceneSplitTask(const ObjectId &owner, double threshold, int markersCategory, bool addSubclips, int minDuration, QObject *object)
: AbstractTask(owner, AbstractTask::ANALYSECLIPJOB, object)
, m_threshold(threshold)
, m_jobDuration(0)
, m_markersType(markersCategory)
, m_subClips(addSubclips)
, m_minInterval(minDuration)
, m_jobProcess(nullptr)
{
qDebug() << "Threshold is" << threshold << QString::number(threshold);
}
void SceneSplitTask::start(QObject *object, bool force)
......@@ -137,7 +143,7 @@ void SceneSplitTask::run()
QStringLiteral("-i"),
source,
QStringLiteral("-filter:v"),
QString("select='gt(scene,0.1)',showinfo"),
QString("select='gt(scene,%1)',showinfo").arg(m_threshold),
QStringLiteral("-vsync"),
QStringLiteral("vfr"),
QStringLiteral("-f"),
......
......@@ -24,6 +24,7 @@ private slots:
void processLogErr();
private:
double m_threshold;
int m_jobDuration;
int m_markersType;
bool m_subClips;
......
......@@ -17,10 +17,15 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KIO/RenameDialog>
#include <KLineEdit>
#include <KLocalizedString>
#include <KUrlRequester>
#include <QApplication>
#include <QCheckBox>
#include <QDialogButtonBox>
#include <QDoubleSpinBox>
#include <QProcess>
#include <QThread>
#include <klocalizedstring.h>
#include <QVBoxLayout>
SpeedTask::SpeedTask(const ObjectId &owner, const QString &binId, const QString &destination, int in, int out,
std::unordered_map<QString, QVariant> filterParams, QObject *object)
......
......@@ -17,12 +17,13 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <QListWidget>
#include <QMenu>
#include <QMenuBar>
#include <QVBoxLayout>
#include <KColorScheme>
#include <KConfigGroup>
#include <KLocalizedString>
#include <KSharedConfig>
#include <KXMLGUIFactory>
#include <klocalizedstring.h>
LayoutManagement::LayoutManagement(QObject *parent)
: QObject(parent)
......
......@@ -78,23 +78,20 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <KDualAction>
#include <KEditToolBar>
#include <KIconTheme>
#include <KLocalizedString>
#include <KMessageBox>
#include <KNS3/QtQuickDialogWrapper>
#include <KNotifyConfigWidget>
#include <KRecentDirs>
#include <KShortcutsDialog>
#include <KStandardAction>
#include <KToggleFullScreenAction>
#include <KToolBar>
#include <KXMLGUIFactory>
#include <klocalizedstring.h>
#include <knewstuff_version.h>
#include <kns3/qtquickdialogwrapper.h>
#include <kcoreaddons_version.h>
#include <kns3/knewstuffaction.h>
#include <ktogglefullscreenaction.h>
#include <kwidgetsaddons_version.h>
#include <KConfigGroup>
#include <QAction>
#include <QClipboard>
#include <QDialogButtonBox>
#include <QFileDialog>
#include <QMenu>
......
......@@ -54,6 +54,7 @@ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
#include <QToolBar>
#include <QUrl>
#include <QVBoxLayout>
#include <QtMath>
ElidedLinkLabel::ElidedLinkLabel(QWidget *parent)
: QLabel(parent)
......@@ -142,8 +143,8 @@ public:
{
bool decode = false;
switch (property) {
case KFileMetaData::Property::ImageMake:
case KFileMetaData::Property::ImageModel:
case KFileMetaData::Property::Manufacturer:
case KFileMetaData::Property::Model:
case KFileMetaData::Property::ImageDateTime:
case KFileMetaData::Property::BitRate:
case KFileMetaData::Property::TrackNumber:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment