diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 5ef615d5..40ada3e1 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -231,34 +231,26 @@ macro(DeployLinux TARGET) if (EXISTS ${QT_PLUGINS_DIR}/${PLUGIN}) file(GLOB files "${QT_PLUGINS_DIR}/${PLUGIN}/*.so") foreach(file ${files}) - if ("${file}" STREQUAL "libqsqlmimer.so") - continue() - else() - get_prerequisites(${file} PLUGINS 0 1 "" "") - foreach(DEPENDENCY ${PLUGINS}) - get_filename_component(resolved ${DEPENDENCY} NAME_WE) - list(FIND SYSTEM_LIBS_SKIP ${resolved} _index) - if (${_index} GREATER -1) - continue() # Skip system libraries - else() - gp_resolve_item("${file}" "${DEPENDENCY}" "" "" resolved_file) - get_filename_component(resolved_file ${resolved_file} ABSOLUTE) - gp_append_unique(PREREQUISITE_LIBS ${resolved_file}) - get_filename_component(file_canonical ${resolved_file} REALPATH) - gp_append_unique(PREREQUISITE_LIBS ${file_canonical}) - endif() - endforeach() - endif() - if ("${file}" STREQUAL "libqsqlmimer.so") - continue() - else() - install( - FILES ${file} - DESTINATION "share/hyperion/lib/${PLUGIN}" - COMPONENT "Hyperion" - ) - endif() - + get_prerequisites(${file} PLUGINS 0 1 "" "") + foreach(DEPENDENCY ${PLUGINS}) + get_filename_component(resolved ${DEPENDENCY} NAME_WE) + list(FIND SYSTEM_LIBS_SKIP ${resolved} _index) + if (${_index} GREATER -1) + continue() # Skip system libraries + else() + gp_resolve_item("${file}" "${DEPENDENCY}" "" "" resolved_file) + get_filename_component(resolved_file ${resolved_file} ABSOLUTE) + gp_append_unique(PREREQUISITE_LIBS ${resolved_file}) + get_filename_component(file_canonical ${resolved_file} REALPATH) + gp_append_unique(PREREQUISITE_LIBS ${file_canonical}) + endif() + endforeach() + + install( + FILES ${file} + DESTINATION "share/hyperion/lib/${PLUGIN}" + COMPONENT "Hyperion" + ) endforeach() endif() endforeach() diff --git a/help/db/hyperion.db b/help/db/hyperion.db deleted file mode 100644 index b7ce72cd..00000000 Binary files a/help/db/hyperion.db and /dev/null differ diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp index 6c04574e..8af1346a 100644 --- a/libsrc/jsonserver/JsonClientConnection.cpp +++ b/libsrc/jsonserver/JsonClientConnection.cpp @@ -36,8 +36,6 @@ void JsonClientConnection::readRequest() // remove message data from buffer _receiveBuffer = _receiveBuffer.mid(bytes); - std::cout << "JsonClientConnection::readRequest | [" << _socket->peerAddress().toString().toStdString() << "] Received: [" << message.toStdString() << "]" << std::endl; - // handle message _jsonAPI->handleMessage(message); @@ -51,8 +49,6 @@ qint64 JsonClientConnection::sendMessage(QJsonObject message) QJsonDocument writer(message); QByteArray data = writer.toJson(QJsonDocument::Compact) + "\n"; - std::cout << "JsonClientConnection::sendMessage | [" << _socket->peerAddress().toString().toStdString() << "] Send: [" << data.constData() << "]" << std::endl; - if (!_socket || (_socket->state() != QAbstractSocket::ConnectedState)) return 0; return _socket->write(data.data(), data.size()); }