Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build with Qt6 and optionally with QML #11608

Merged
merged 7 commits into from
Jun 3, 2023
Merged

Build with Qt6 and optionally with QML #11608

merged 7 commits into from
Jun 3, 2023

Commits on May 30, 2023

  1. distinguish between qt6 and qml code, fix compilation with qt6

    @m0dB
    m0dB committed May 30, 2023
    Configuration menu
    Copy the full SHA
    3d1c7a6 View commit details
    Browse the repository at this point in the history

  2. fix compilation, rebased on 2.4

    @m0dB
    m0dB committed May 30, 2023
    Configuration menu
    Copy the full SHA
    3e67e63 View commit details
    Browse the repository at this point in the history

  3. correct size policy for widget group containing waveforms

    @m0dB
    m0dB committed May 30, 2023
    Configuration menu
    Copy the full SHA
    d5c96f4 View commit details
    Browse the repository at this point in the history

  4. Don't include X11Info on QT6

    @ywwg
    ywwg committed May 30, 2023
    Configuration menu
    Copy the full SHA
    e003297 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #5 from ywwg/build-with-qt6-optional-qml 

    Don't include X11Info on QT6
    @m0dB
    m0dB authored May 30, 2023
    Configuration menu
    Copy the full SHA
    88e990a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Silence some float conversion warnings by making conversion explicit

    @ywwg
    ywwg committed May 31, 2023
    Configuration menu
    Copy the full SHA
    d7c37a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Merge pull request #6 from ywwg/build-with-qt6-optional-qml 

    Silence some float conversion warnings by making conversion explicit
    @m0dB
    m0dB authored Jun 2, 2023
    Configuration menu
    Copy the full SHA
    3137224 View commit details
    Browse the repository at this point in the history