--- sonic-pi-4.5.1/app/gui/qt/CMakeLists.txt.orig 2024-04-28 19:49:33.000000000 +0200 +++ sonic-pi-4.5.1/app/gui/qt/CMakeLists.txt 2025-01-21 22:21:22.432063200 +0100 @@ -44,18 +44,18 @@ set_property(GLOBAL PROPERTY AUTOMOC_FOLDER Automoc) set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER Automoc) -find_package(Qt6 QUIET) +find_package(Qt5 QUIET) -if(Qt6_FOUND AND WITH_QT_GUI_WEBENGINE) - find_package(Qt6 COMPONENTS Core Widgets Gui Concurrent Network OpenGLWidgets PrintSupport Xml Svg LinguistTools WebEngineWidgets REQUIRED) +if(Qt5_FOUND AND WITH_QT_GUI_WEBENGINE) + find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg LinguistTools WebEngineWidgets REQUIRED) add_compile_definitions(WITH_WEBENGINE) -elseif(Qt6_FOUND) - find_package(Qt6 COMPONENTS Core Widgets Gui Concurrent Network OpenGLWidgets PrintSupport Xml Svg LinguistTools REQUIRED) +elseif(Qt5_FOUND) + find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg LinguistTools REQUIRED) elseif(WITH_QT_GUI_WEBENGINE) - find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg LinguistTools WebEngineWidgets REQUIRED) + find_package(Qt6 COMPONENTS Core Widgets Gui Concurrent Network OpenGLWidgets PrintSupport Xml Svg LinguistTools WebEngineWidgets REQUIRED) add_compile_definitions(WITH_WEBENGINE) else() - find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg LinguistTools REQUIRED) + find_package(Qt6 COMPONENTS Core Widgets Gui Concurrent Network OpenGLWidgets PrintSupport Xml Svg LinguistTools REQUIRED) endif() find_package(Threads REQUIRED) @@ -219,7 +219,10 @@ set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION ${QTAPP_ROOT}/lang) -if (Qt6_FOUND) +if (Qt5_FOUND) + qt5_add_translation(QM_FILES ${TS_FILES}) + set_property(SOURCE ${APP_NAME} APPEND PROPERTY OBJECT_DEPENDS ${QM_FILES}) +else() if (${Qt6Core_VERSION} VERSION_LESS "6.7.0") qt_add_lrelease(${APP_NAME} TS_FILES ${TS_FILES}) else() @@ -227,9 +230,6 @@ set(LRELEASE_TARGET "${APP_NAME}_lrelease") qt_add_lrelease(TS_FILES ${TS_FILES} LRELEASE_TARGET ${LRELEASE_TARGET}) endif() -else() - qt5_add_translation(QM_FILES ${TS_FILES}) - set_property(SOURCE ${APP_NAME} APPEND PROPERTY OBJECT_DEPENDS ${QM_FILES}) endif() --- sonic-pi-4.5.1/app/gui/qt/QScintilla_src-2.14.1/CMakeLists.txt.orig 2024-04-28 19:49:33.000000000 +0200 +++ sonic-pi-4.5.1/app/gui/qt/QScintilla_src-2.14.1/CMakeLists.txt 2025-01-21 22:37:46.872409916 +0100 @@ -1,9 +1,9 @@ -find_package(Qt6 QUIET) +find_package(Qt5 QUIET) -if(Qt6_FOUND) - find_package(Qt6 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED) -else() +if(Qt5_FOUND) find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED) +else() + find_package(Qt6 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED) endif()