...
 
Commits (4)
......@@ -51,7 +51,7 @@ include(ECMAddAppIcon)
include(ECMQtDeclareLoggingCategory)
include(ECMEnableSanitizers)
add_definitions(-DTRANSLATION_DOMAIN=\"kdenlive\")
find_package(KF5 5.45.0 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets
find_package(KF5 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets
DBusAddons KIO WidgetsAddons NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes Declarative Solid
OPTIONAL_COMPONENTS DocTools FileMetaData Crash Purpose)
......
......@@ -35,7 +35,7 @@ std::unique_ptr<Mlt::Repository> repo(Mlt::Factory::init(nullptr));
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
qputenv("MLT_TESTS", QByteArray("1"));
Core::build();
Core::build(false);
const char *input = reinterpret_cast<const char *>(data);
char *target = new char[size + 1];
strncpy(target, input, size);
......
......@@ -45,7 +45,7 @@ int main(int argc, char **argv)
signal(SIGSEGV, signalHandler);
QApplication app(argc, argv);
qputenv("MLT_TESTS", QByteArray("1"));
Core::build();
Core::build(false);
std::stringstream ss;
std::string str;
while (getline(std::cin, str)) {
......
......@@ -34,8 +34,12 @@ Splash::Splash(QObject *parent)
{
KDeclarative::KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(m_engine);
#if KDECLARATIVE_VERSION >= QT_VERSION_CHECK(5, 45, 0)
kdeclarative.setupEngine(m_engine);
kdeclarative.setupContext();
#else
kdeclarative.setupBindings();
#endif
component = new QQmlComponent(m_engine);
QQuickWindow::setDefaultAlphaBuffer(true);
component->loadUrl(QUrl(QStringLiteral("qrc:/qml/splash.qml")));
......
......@@ -36,8 +36,12 @@ BuiltStack::BuiltStack(AssetPanel *parent)
KDeclarative::KDeclarative kdeclarative;
QQmlEngine *eng = engine();
kdeclarative.setDeclarativeEngine(eng);
kdeclarative.setupContext();
#if KDECLARATIVE_VERSION >= QT_VERSION_CHECK(5, 45, 0)
kdeclarative.setupEngine(eng);
kdeclarative.setupContext();
#else
kdeclarative.setupBindings();
#endif
// qmlRegisterType<ColorWheelItem>("Kdenlive.Controls", 1, 0, "ColorWheelItem");
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setMinimumHeight(300);
......
......@@ -479,6 +479,7 @@ Rectangle {
property int clickedY
onAboutToHide: {
timeline.ungrabHack()
editGuideMenu.visible = false
}
OLD.MenuItem {
text: i18n('Paste')
......@@ -547,7 +548,6 @@ Rectangle {
editGuideMenu.visible = true
} else {
addGuideMenu.text = i18n('Add Guide')
editGuideMenu.visible = false
}
console.log("pop menu")
}
......@@ -556,6 +556,10 @@ Rectangle {
id: rulermenu
property int clickedX
property int clickedY
onAboutToHide: {
timeline.ungrabHack()
editGuideMenu2.visible = false
}
OLD.MenuItem {
id: addGuideMenu2
text: i18n('Add Guide')
......@@ -585,7 +589,6 @@ Rectangle {
editGuideMenu2.visible = true
} else {
addGuideMenu2.text = i18n('Add Guide')
editGuideMenu2.visible = false
}
console.log("pop menu")
}
......