Commit fd8e513f authored by Simon Eugster's avatar Simon Eugster

Fix other builds

parent b4128552
Pipeline #23027 passed with stage
in 15 minutes and 20 seconds
......@@ -9,6 +9,7 @@ include_directories(
set(kdenlive_render_SRCS
kdenlive_render.cpp
renderjob.cpp
../src/lib/localeHandling.cpp
)
add_executable(kdenlive_render ${kdenlive_render_SRCS})
......
......@@ -23,11 +23,6 @@
#include <QApplication>
#include <QDir>
#include <QDomDocument>
#include <QObject>
#include <QString>
#include <QStringList>
#include <QtGlobal>
#include <cstdio>
int main(int argc, char **argv)
{
......
......@@ -29,13 +29,13 @@ TEST_CASE("Basic creation/deletion of a composition", "[CompositionModel]")
std::shared_ptr<TimelineItemModel> timeline = TimelineItemModel::construct(&profile_composition, guideModel, undoStack);
REQUIRE(timeline->getCompositionsCount() == 0);
int id1 = CompositionModel::construct(timeline, aCompo);
int id1 = CompositionModel::construct(timeline, aCompo, QString());
REQUIRE(timeline->getCompositionsCount() == 1);
int id2 = CompositionModel::construct(timeline, aCompo);
int id2 = CompositionModel::construct(timeline, aCompo, QString());
REQUIRE(timeline->getCompositionsCount() == 2);
int id3 = CompositionModel::construct(timeline, aCompo);
int id3 = CompositionModel::construct(timeline, aCompo, QString());
REQUIRE(timeline->getCompositionsCount() == 3);
// Test deletion
......@@ -58,11 +58,11 @@ TEST_CASE("Composition manipulation", "[CompositionModel]")
int tid0 = TrackModel::construct(timeline);
Q_UNUSED(tid0);
int tid1 = TrackModel::construct(timeline);
int cid2 = CompositionModel::construct(timeline, aCompo);
int cid2 = CompositionModel::construct(timeline, aCompo, QString());
int tid2 = TrackModel::construct(timeline);
int tid3 = TrackModel::construct(timeline);
Q_UNUSED(tid3);
int cid1 = CompositionModel::construct(timeline, aCompo);
int cid1 = CompositionModel::construct(timeline, aCompo, QString());
REQUIRE(timeline->getCompositionPlaytime(cid1) == 1);
REQUIRE(timeline->getCompositionPlaytime(cid2) == 1);
......
......@@ -1952,7 +1952,7 @@ TEST_CASE("Operations under locked tracks", "[Locked]")
}
SECTION("Can't move composition on locked track")
{
int compo = CompositionModel::construct(timeline, aCompo);
int compo = CompositionModel::construct(timeline, aCompo, QString());
timeline->setTrackLockedState(tid1, true);
REQUIRE(timeline->getTrackById(tid1)->isLocked());
REQUIRE(timeline->checkConsistency());
......@@ -2025,7 +2025,7 @@ TEST_CASE("Operations under locked tracks", "[Locked]")
}
SECTION("Can't resize composition on locked track")
{
int compo = CompositionModel::construct(timeline, aCompo);
int compo = CompositionModel::construct(timeline, aCompo, QString());
REQUIRE(timeline->requestCompositionMove(compo, tid1, 2));
REQUIRE(timeline->requestItemResize(compo, 20, true) == 20);
......
set(mltpreview_SRCS mltpreview.cpp)
set(mltpreview_SRCS mltpreview.cpp ../src/lib/localeHandling.cpp)
include_directories(
${MLT_INCLUDE_DIR}
......
Markdown is supported
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