[us-commits] [ehb54/ultrascan3] 3a3efd: SOMO: support both Qt5 and Qt6 (PR #335 made SOMO ...

[emre brookes]

  Branch: refs/heads/ehb54-issue-943
  Home:   https://github.com/ehb54/ultrascan3
  Commit: 3a3efdb03a7cb094776b2a0f6c7d45d4d55a5d29
      https://github.com/ehb54/ultrascan3/commit/3a3efdb03a7cb094776b2a0f6c7d45d4d55a5d29
  Author: ehb54 <brookes at uthscsa.edu>
  Date:   2026-07-02 (Thu, 02 Jul 2026)

  Changed paths:
    M us_somo/develop/CMakeLists.txt
    M us_somo/develop/vcpkg.json

  Log Message:
  -----------
  SOMO: support both Qt5 and Qt6 (PR #335 made SOMO Qt5/Qt6 compatible)

CMakeLists: use the version-agnostic idiom
    find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
    find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ...)
and link Qt${QT_VERSION_MAJOR}::... so SOMO follows whichever Qt the build
selects (Qt5 today, Qt6 for the next release). CI/CodeQL exercise both.

Standalone vcpkg.json: replace the flat Qt5 dep list with qt5 (default) and
qt6 features (qtbase/qtsvg/qtmultimedia + qwt-6-3-0-qt6/qwtplot3d-qwt-6-3-0-qt6);
select Qt6 via --x-feature=qt6. Overlay ports already present.

TODO(Qt6): QtOpenGL split — add OpenGLWidgets component if the code uses
QOpenGLWidget under Qt6.

Refs ehb54/ultrascan-tickets#943

Co-Authored-By: Claude Opus 4.8 <noreply at anthropic.com>



To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications