Commit 111b6b92 authored by Vincent Pinon's avatar Vincent Pinon

Merge branch 'master' into refactoring_timeline

parents 166eb5e1 f22aad4c
Active Kdenlive authors
Jean-Baptiste Mardelle <jb@kdenlive.org>
MLT and KDE SC 4 / KF5 port, main developer and maintainer
Main developer and maintainer, MLT and KDE SC 4 / KF5 port,
2005-present
Nicolas Carion <french.ebook.lover@gmail.com>
Code re-architecture & timeline rewrite
......@@ -15,12 +15,12 @@ Former Kdenlive authors
Laurent Montel <montel@kde.org>
Bugs fixing, code clean up, review
2013-2017
Steve Guilford <s.guilford@dbplugins.com>
Bug fixing
2014
Till Theato <root@ttill.de>
Rotoscoping, bug fixing, etc.
2009-2015
Steve Guilford <s.guilford@dbplugins.com>
Bug fixing
2014
Simon A. Eugster (Granjow) <simon.eu@gmail.com>
Colour and audio scopes, titler, manual, bug fixing, etc.
2009-2012
......
......@@ -99,6 +99,9 @@ find_package(KF5 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigW
DBusAddons KIO WidgetsAddons NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes
Declarative Solid
OPTIONAL_COMPONENTS DocTools FileMetaData Crash Purpose)
if(WIN32)
find_package(DrMinGW)
endif(WIN32)
if (KF5FileMetaData_FOUND)
message(STATUS "Found KF5 FileMetadata to extract file metadata")
......
# cmake macro to find DrMinGW Windows crash handler
#
# copyright (c) 2018, Vincent Pinon <vpinon@kde.org>
#
# once done this will define:
#
# DRMINGW_FOUND - system has DrMinGW
# DRMINGW_INCLUDE_DIR - the DrMinGW include directory
# DRMINGW_LIBRARY - the libraries needed to use DrMinGW
#
# redistribution and use is allowed according to the terms of the bsd license.
if (DRMINGW_INCLUDE_DIR AND DRMINGW_LIBRARY)
# already in cache, be silent
set (DRMINGW_FIND_QUIETLY true)
endif (DRMINGW_INCLUDE_DIR AND DRMINGW_LIBRARY)
find_path (DRMINGW_INCLUDE_DIR exchndl.h)
find_library (DRMINGW_LIBRARY exchndl)
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (DrMinGW DEFAULT_MSG DRMINGW_INCLUDE_DIR DRMINGW_LIBRARY)
mark_as_advanced(DRMINGW_INCLUDE_DIR DRMINGW_LIBRARY)
......@@ -252,7 +252,7 @@
</ul>
</description>
<releases>
<release date="2018-08-16" version="18.08.0"/>
<release date="2018-09-06" version="18.08.1"/>
</releases>
<url type="homepage">https://kdenlive.org/</url>
<url type="bugtracker">https://bugs.kde.org</url>
......
......@@ -307,9 +307,12 @@ if (KF5_FILEMETADATA)
target_link_libraries(kdenliveLib KF5::FileMetaData)
endif()
if (KF5Crash_FOUND)
if (DRMINGW_FOUND)
add_definitions(-DUSE_DRMINGW)
target_link_libraries(kdenlive ${DRMINGW_LIBRARY})
elseif (KF5Crash_FOUND)
add_definitions(-DKF5_USE_CRASH)
target_link_libraries(kdenliveLib KF5::Crash)
target_link_libraries(kdenlive KF5::Crash)
endif()
if (KF5_PURPOSE)
......
......@@ -176,6 +176,8 @@ void Core::initGUI(const QUrl &Url)
m_producerQueue = new ProducerQueue(m_binController);
connect(m_producerQueue, &ProducerQueue::gotFileProperties, m_binWidget, &Bin::slotProducerReady);
connect(m_producerQueue, &ProducerQueue::replyGetImage, m_binWidget, &Bin::slotThumbnailReady);
connect(m_producerQueue, &ProducerQueue::requestProxy,
[this](const QString &id){ m_binWidget->startJob(id, AbstractClipJob::PROXYJOB);});
connect(m_producerQueue, &ProducerQueue::removeInvalidClip, m_binWidget, &Bin::slotRemoveInvalidClip, Qt::DirectConnection);
connect(m_producerQueue, SIGNAL(addClip(QString, QMap<QString, QString>)), m_binWidget, SLOT(slotAddUrl(QString, QMap<QString, QString>)));
connect(m_binController.get(), SIGNAL(createThumb(QDomElement, QString, int)), m_producerQueue, SLOT(getFileProperties(QDomElement, QString, int)));
......
......@@ -27,9 +27,12 @@
#include <KAboutData>
#include <KConfigGroup>
#ifdef KF5_USE_CRASH
#include <KCrash>
#ifdef USE_DRMINGW
# include <exchndl.h>
#elif defined(KF5_USE_CRASH)
# include <KCrash>
#endif
#include <KIconLoader>
#include <KSharedConfig>
......@@ -152,7 +155,9 @@ int main(int argc, char *argv[])
parser.process(app);
aboutData.processCommandLine(&parser);
#ifdef KF5_USE_CRASH
#ifdef USE_DRMINGW
ExcHndlInit();
#elif defined(KF5_USE_CRASH)
KCrash::initialize();
#endif
......
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