[us-commits] [ehb54/ultrascan3] b02949: Modernize `FindQwt.cmake` for dynamic Qt version d...

Lukas Dobler noreply at github.com
Mon Oct 27 05:19:31 MDT 2025


  Branch: refs/heads/lukas/qt6-compile
  Home:   https://github.com/ehb54/ultrascan3
  Commit: b0294917db216081128ee6776aa0885343e57fa1
      https://github.com/ehb54/ultrascan3/commit/b0294917db216081128ee6776aa0885343e57fa1
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M admin/cmake/FindQwt.cmake

  Log Message:
  -----------
  Modernize `FindQwt.cmake` for dynamic Qt version detection and improved path handling

- Replaced hardcoded Qt version checks with `QT_VERSION_MAJOR` for better flexibility.
- Unified Qwt path suffix definitions to eliminate redundancy.
- Updated Qwt include search logic to enhance maintainability and alignment with current Qt standards.


  Commit: ddfe73b1aa17df2f2421be4328756e27808905c5
      https://github.com/ehb54/ultrascan3/commit/ddfe73b1aa17df2f2421be4328756e27808905c5
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M utils/us_util.h

  Log Message:
  -----------
  Refactor `UUID_REGEX` declaration in `US_Util`

- Moved `UUID_REGEX` from an inline static to a static member for consistency and improved maintainability.


  Commit: 9544a154835325e5c55cd9c951d90b3b563b4b68
      https://github.com/ehb54/ultrascan3/commit/9544a154835325e5c55cd9c951d90b3b563b4b68
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M utils/us_util.cpp

  Log Message:
  -----------
  Add `UUID_REGEX` as a static member in `US_Util`

- Introduced `UUID_REGEX` as a static member for standardized UUID validation.
- Ensures consistency and improves code clarity by centralizing the regular expression definition.


  Commit: be365b4a7833917e7995ff67c206636d31662824
      https://github.com/ehb54/ultrascan3/commit/be365b4a7833917e7995ff67c206636d31662824
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M utils/us_db2.cpp

  Log Message:
  -----------
  Add conditional handling for `LIBMARIADB` and `LIBMYSQL` SSL options in `US_DB2`

- Introduced checks for `LIBMARIADB` and `LIBMYSQL` to appropriately configure SSL options.
- Ensured `MYSQL_OPT_SSL_VERIFY_SERVER_CERT` is disabled for `LIBMARIADB` and `MYSQL_OPT_SSL_MODE` is set to `SSL_MODE_REQUIRED` for `LIBMYSQL`.
- Improved compatibility and clarity by tailoring SSL behavior based on the library in use.


  Commit: fb1ac1a0cdb0632fb12ea84c6305fc25683502a1
      https://github.com/ehb54/ultrascan3/commit/fb1ac1a0cdb0632fb12ea84c6305fc25683502a1
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Add conditional Qt version handling and improve MySQL/MariaDB configuration in CMake

- Introduced `USE_QT6` option to dynamically set `CMAKE_CXX_STANDARD` and related Qt configurations.
- Added `QT_VERSION_MAJOR` and related variables for streamlined Qt version management.
- Enhanced MySQL/MariaDB detection by setting version and module details for improved logging and clarity.
- Updated `googletest` to version `v1.16.0`.


  Commit: f45449d5afe29c6ce2333a490f74d922ca77e56a
      https://github.com/ehb54/ultrascan3/commit/f45449d5afe29c6ce2333a490f74d922ca77e56a
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M gui/us_analysis_base2.cpp
    M gui/us_analyte_gui.cpp
    M gui/us_buffer_gui.cpp
    M gui/us_combined_plots_parms_gui.cpp
    M gui/us_csv_loader.cpp
    M gui/us_gui_util.cpp
    M gui/us_investigator.cpp
    M gui/us_license.cpp
    M gui/us_model_gui.cpp
    M gui/us_model_loader.cpp
    M gui/us_mwl_data.cpp
    M gui/us_plot.cpp
    M gui/us_plot.h
    M gui/us_plot3d.cpp
    M gui/us_plot3d.h
    M gui/us_predict1.cpp
    M gui/us_predict1.h
    M gui/us_report_general_gui.cpp
    M gui/us_report_gui.cpp
    M gui/us_sassoc.cpp
    M gui/us_sassoc.h
    M gui/us_scan_excl_gui.cpp
    M gui/us_solution_gui.cpp
    M gui/us_spectrodata.cpp
    M gui/us_spectrodata.h
    M gui/us_widgets.h

  Log Message:
  -----------
  Migrate `QRegExp` to `QRegularExpression` and update deprecated Qt API usage

- Replaced `QRegExp` with `QRegularExpression` across all relevant files for improved performance and modern API compatibility.
- Updated deprecated methods like `setMargin` to `setContentsMargins` and `replace` overloads to use updated syntax.
- Migrated `QGLWidget` to `QOpenGLWidget` for Qt5/Qt6 compatibility.
- Adjusted signals, slots, and method parameters for use with modern Qt data types (`QPointF` replacing `QwtDoublePoint`).
- Removed legacy/deprecated preprocessor macros and redundant Qt4-specific code paths.


  Commit: e0dac0f05cc15e30b37122b5d93220d8ddbd06d6
      https://github.com/ehb54/ultrascan3/commit/e0dac0f05cc15e30b37122b5d93220d8ddbd06d6
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M programs/us/us.cpp

  Log Message:
  -----------
  Replace `this` with `parent` in `QMessageBox::critical` calls and update argument handling for clarity and consistency.


  Commit: 229876ffd3dfa190e508942203f782c7ccd3a21c
      https://github.com/ehb54/ultrascan3/commit/229876ffd3dfa190e508942203f782c7ccd3a21c
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M programs/us_2dsa/us_show_norm.cpp

  Log Message:
  -----------
  Replace `QwtDoubleRect` with `QRectF` in `us_show_norm.cpp` for consistency with modern Qt data types.


  Commit: 421adc1b835b9669f6f7be9ff74061f86da49cce
      https://github.com/ehb54/ultrascan3/commit/421adc1b835b9669f6f7be9ff74061f86da49cce
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M programs/us_abde/us_abde_main.cpp
    M programs/us_abde/us_norm_profile.cpp
    M programs/us_abde/us_norm_profile.h

  Log Message:
  -----------
  Replace `setMargin` with `setContentsMargins` and `QwtDoublePoint` with `QPointF` for consistency and modernization of Qt API usage.


  Commit: 2e2a2088ff9f6aa86d3c71efffe1849208b69db0
      https://github.com/ehb54/ultrascan3/commit/2e2a2088ff9f6aa86d3c71efffe1849208b69db0
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M programs/main1.inc

  Log Message:
  -----------
  Replace `QRegExp` with `QRegularExpression` in `main1.inc` for modernization and improved Qt API compatibility.


  Commit: 157763286ccf749d9a866acd9608224ab5438fbf
      https://github.com/ehb54/ultrascan3/commit/157763286ccf749d9a866acd9608224ab5438fbf
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M programs/us_analysis_profile/us_analysis_profile.cpp

  Log Message:
  -----------
  Migrate `QRegExp` to `QRegularExpression` in `us_analysis_profile.cpp` for modernization and updated Qt API compliance.


  Commit: 77d60151680de84d196e426431c20338d7037b75
      https://github.com/ehb54/ultrascan3/commit/77d60151680de84d196e426431c20338d7037b75
  Author: doluk <69309597+doluk at users.noreply.github.com>
  Date:   2025-10-27 (Mon, 27 Oct 2025)

  Changed paths:
    M programs/us_astfem_sim/us_astfem_sim.cpp

  Log Message:
  -----------
  Replace `currentDateTime().toUTC()` with `currentDateTimeUtc()` for improved readability and adherence to modern Qt API usage.


Compare: https://github.com/ehb54/ultrascan3/compare/cdfc55c93b1b...77d60151680d

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


More information about the us-commits mailing list