Various Fixes/Updates (#1549)

* Update FindWindowsSDK.cmake

* cmake support libcec without version

* Ensure Light-Ids are strings

* Fix type - do not have dbus as requried

* Fixing #1544

* Cleanup

* CleanupFix #1551

* Consistently return instance number with JSON replies (#1504)

* hyperion-remote- Fix extracting reply for configGet request

* Qt 6.6 - Fix iterator finds

* Fix test_image2ledsmap

* Ensure window.currentHyperionInstanceName is set, cleanup system/log clipboard report

* Address protobuf cmake warning

* Update License

* Update ChangeLog

* Address CodeQL and clang findings
This commit is contained in:
LordGrey
2023-01-16 11:01:28 +00:00
committed by GitHub
parent f665f1e1b6
commit fa7a5b6b56
23 changed files with 187 additions and 102 deletions

View File

@@ -42,16 +42,16 @@ endif(ENABLE_X11)
add_executable(test_versions TestVersions.cpp)
target_link_libraries(test_versions Qt${QT_VERSION_MAJOR}::Core)
add_executable(test_image2ledsmap TestImage2LedsMap.cpp "${CMAKE_BINARY_DIR}/resources.qrc" )
link_to_hyperion(test_image2ledsmap)
######### These tests are broken. May they fix someone ##########
# add_executable(test_image2ledsmap TestImage2LedsMap.cpp)
# link_to_hyperion(test_image2ledsmap)
# if (ENABLE_DISPMANX)
#if (ENABLE_DISPMANX)
# add_subdirectory(dispmanx2png)
# endif (ENABLE_DISPMANX)
#endif (ENABLE_DISPMANX)
# add_executable(test_blackborderprocessor TestBlackBorderProcessor.cpp)
# link_to_hyperion(test_blackborderprocessor)
#add_executable(test_blackborderprocessor TestBlackBorderProcessor.cpp)
#link_to_hyperion(test_blackborderprocessor)
###################################################

View File

@@ -9,10 +9,9 @@
int main()
{
QString homeDir = getenv("RASPILIGHT_HOME");
const QString schemaFile = ":/hyperion-schema";
const QString configFile = ":/hyperion_default.config";
const QString schemaFile = homeDir + "/hyperion.schema.json";
const QString configFile = homeDir + "/hyperion.config.json";
QJsonObject config;
if (QJsonFactory::load(schemaFile, configFile, config) < 0)