Commit 612df778 authored by Matthieu Gallien's avatar Matthieu Gallien

provides an updated plugins.qmltypes and partial fix for qmlplugindump

parent b6fea1ef
......@@ -34,6 +34,7 @@ include(FeatureSummary)
include(ECMAddAppIcon)
include(ECMAddTests)
include(ECMQtDeclareLoggingCategory)
include(ECMGenerateQmlTypes)
if (NOT WIN32)
find_package(Qt5DBus ${REQUIRED_QT_VERSION} CONFIG QUIET)
......@@ -166,6 +167,8 @@ ecm_setup_version(${PROJECT_VERSION}
VARIABLE_PREFIX ELISA
VERSION_HEADER elisa-version.h)
set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/bin CACHE STRING "" FORCE)
add_subdirectory(src)
add_subdirectory(icons)
if (BUILD_TESTING)
......
......@@ -354,6 +354,9 @@ add_custom_command(TARGET copy2 PRE_BUILD
add_dependencies(elisaqmlplugin copy copy2)
ecm_generate_qmltypes(org.kde.elisa 1.0
DESTINATION <${KDE_INSTALL_QMLDIR}/org/kde/elisa>)
if (Qt5Quick_FOUND AND Qt5Widgets_FOUND)
set(elisa_SOURCES
main.cpp
......
......@@ -139,7 +139,13 @@ MusicListenersManager::MusicListenersManager(QObject *parent)
}
MusicListenersManager::~MusicListenersManager()
= default;
{
d->mListenerThread.quit();
d->mListenerThread.wait();
d->mDatabaseThread.quit();
d->mDatabaseThread.wait();
}
DatabaseInterface *MusicListenersManager::viewDatabase() const
{
......
This diff is collapsed.
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