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.

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

Add experimental Qt 6 support flags. #7182

Merged
merged 60 commits into from
Apr 25, 2024
Merged

Commits on Mar 24, 2024

  1. refactored gui_templates.h

    Rossmaxx committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    42a2f19 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    573177a View commit details
    Browse the repository at this point in the history
  3. oops

    Rossmaxx committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    9143a05 View commit details
    Browse the repository at this point in the history
  4. added some qt6 flags

    Rossmaxx committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    f3aaeb5 View commit details
    Browse the repository at this point in the history
  5. remotevst

    Rossmaxx committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    3dad2b8 View commit details
    Browse the repository at this point in the history
  6. missed this on src/cmakelist

    Rossmaxx committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    1a11e9c View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Configuration menu
    Copy the full SHA
    9ca4132 View commit details
    Browse the repository at this point in the history
  2. another minor one

    Rossmaxx committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    eebe551 View commit details
    Browse the repository at this point in the history
  3. bump up minor version

    Rossmaxx committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ef13bcb View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. generation success

    Rossmaxx committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    a596216 View commit details
    Browse the repository at this point in the history
  2. Revert "refactored gui_templates.h"

    This reverts commit 42a2f19.
    Rossmaxx committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    5bc0cf9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    72a7985 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5f7530c View commit details
    Browse the repository at this point in the history
  5. does this fix it?

    Rossmaxx committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    09de46e View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. added status check for qt6

    Rossmaxx committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    a2d83dc View commit details
    Browse the repository at this point in the history
  2. alignment

    Rossmaxx committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    aa22ef5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e8119ea View commit details
    Browse the repository at this point in the history
  4. status_vst

    Rossmaxx committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    f79b490 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Configuration menu
    Copy the full SHA
    c77b93b View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Configuration menu
    Copy the full SHA
    74f1835 View commit details
    Browse the repository at this point in the history
  2. moved ui files

    Rossmaxx committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    46bd6b7 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Configuration menu
    Copy the full SHA
    9470abc View commit details
    Browse the repository at this point in the history
  2. try to fix the rcc error

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    bba21f9 View commit details
    Browse the repository at this point in the history
  3. rpmalloc

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    faae414 View commit details
    Browse the repository at this point in the history
  4. declare cpp 17 explicitly

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    46fdf26 View commit details
    Browse the repository at this point in the history
  5. reorder cpp 17 call

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    5bd8290 View commit details
    Browse the repository at this point in the history
  6. temp

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    5057356 View commit details
    Browse the repository at this point in the history
  7. lmmsobjs

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    bfb438b View commit details
    Browse the repository at this point in the history
  8. permissive

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    1bee307 View commit details
    Browse the repository at this point in the history
  9. quotes

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    74712d3 View commit details
    Browse the repository at this point in the history
  10. cleanup

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6b8ec51 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    8d78274 View commit details
    Browse the repository at this point in the history
  12. Revert unnecessary autoui changes

    This reverts commit 9470abc, reversing
    changes made to c77b93b.
    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    9d85660 View commit details
    Browse the repository at this point in the history
  13. Revert "does this fix it?"

    This reverts commit 09de46e.
    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    853cffa View commit details
    Browse the repository at this point in the history
  14. try to use older cmake

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    263cfa8 View commit details
    Browse the repository at this point in the history
  15. Revert "reorder cpp 17 call"

    This reverts commit 5bd8290.
    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    077dfa4 View commit details
    Browse the repository at this point in the history
  16. freeboy

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    f8284e8 View commit details
    Browse the repository at this point in the history
  17. made comment clearer

    Rossmaxx committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    753b2a9 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    1d6a892 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Make the minimum code compile for Qt6

    The following changes are applied to make the minimum build configuration compile:
    *  Remove usage of a `QKeyEvent` constructor in `ColorChooser.h` by directly forwarding the original event.
    * Change `QMap` to `QMulitMap` in several places in `ControlLayout.h` because that's what in fact is used.
    * Change the parameter from `QEvent` to `QEnterEvent` in some `enterEvent` overrides.
    * Add an include for `algorithm` in `MixHelpers.cpp`
    * Fix a problem with string argument replacement in `embed.cpp`
    * Introduce the usage of `QKeySequence` including the replacement of the `+` operator with the `|` operator.
    * Add an include for `QActionGroup` in `ProjectNotes.cpp`.
    * Use `QPalette::window` instead of `QPalette::background` in `ClipView.cpp`
    * Use `qBound<panning_t>` instead of `qBound<int>` in `PianoRoll.cpp`. Add a cast.
    * Replace the deprecated call to `QLayout::setMargin` with `QLayout::setContentsMargins`
    
    Note: there are still lots of warnings when you compile this state with Qt6!
    michaelgregorius committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    bb4d04b View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Qt 5 support

    Rossmaxx committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    52689c3 View commit details
    Browse the repository at this point in the history
  2. Fix Qt5 build for ControlLayout

    Fix the Qt5 build for `ControlLayout` by intoducing typedefs depending on the Qt version and using these throughout `ControlLayout`.
    michaelgregorius committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    3a83aea View commit details
    Browse the repository at this point in the history
  3. Prepare LadspaMatrixControlDialog for Qt6

    Use `setContentsMargins` instead of `setMargin`.
    michaelgregorius committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    2e736ec View commit details
    Browse the repository at this point in the history
  4. CMakeLists.txt adjustments for Qt6

    Add the dependency to "Core5Compat" to the main CMakeLists.txt. It is needed so that we can use `QTextCodec` which is used by the Hydrogen importer plugin.
    
    Adjust the CMakeLists.txt of the ZynAddSubFx plugin so that it also makes use of `QT_VERSION_MAJOR` and therefore builds under Qt5 and Qt6.
    michaelgregorius committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    835310e View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. force qt 5 on vst for now

    Rossmaxx committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    c262ac2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ea8f8c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Configuration menu
    Copy the full SHA
    9085f05 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f85e45 View commit details
    Browse the repository at this point in the history
  3. Fix build

    Fix the build that failed after the merge of master. The data type that `QColor::getRgbF` uses has changed between Qt5 and Qt6. This is solved with a using because changing the type to `float` which is used by Qt6 did not work with Qt5 either.
    michaelgregorius committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    684afdb View commit details
    Browse the repository at this point in the history
  4. Fix warnings in AutomationClip.cpp

    Fix warnings in `AutomationClip.cpp`. These have been warnings of the type:
    "Warning: »QMap<int, lmms::AutomationNode>::const_iterator operator-(QMap<int, lmms::AutomationNode>::const_iterator, QMap<int, lmms::AutomationNode>::const_iterator::difference_type)« is deprecated: Use std::prev; QMap iterators are not random access [-Wdeprecated-declarations]
    michaelgregorius committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    c456470 View commit details
    Browse the repository at this point in the history
  5. Fix warning in AutomationClipView

    Fix build warning about deprecated iterator operators in `AutomationClipView`.
    michaelgregorius committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    820a88e View commit details
    Browse the repository at this point in the history
  6. Fix deprecated usage of x() and y() methods

    Fix the deprecated usage of the following methods:
    * `QMouseEvent:x()`
    * `QMouseEvent:y()`
    * `QDropEvent:x()`
    * `QDropEvent:y()`
    
    This is done by adding two new helper methods names `position` to `DeprecationHelper.h` and using these methods in the event methods.
    michaelgregorius committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    66ec096 View commit details
    Browse the repository at this point in the history
  7. Fix more iterator operator warnings

    Fix more warnings about iterator operators by using `std::prev` and `std::next`.
    michaelgregorius committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    f2638ae View commit details
    Browse the repository at this point in the history
  8. Fix QKeyCombination warning

    Fix warnings about `QKeyCombination::operator+`.
    michaelgregorius committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    0f83043 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. added minimum version check

    Co-authored-by: Dalton Messmer <messmer.dalton@gmail.com>
    Rossmaxx and messmerd authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    70ede88 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2abe82a View commit details
    Browse the repository at this point in the history
  3. style changes

    Rossmaxx committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    7161377 View commit details
    Browse the repository at this point in the history
  4. zyn build fix for msvc qt6

    Rossmaxx committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    1906ea5 View commit details
    Browse the repository at this point in the history
  5. forgot to rename to zyn

    Rossmaxx committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    2209c3e View commit details
    Browse the repository at this point in the history
  6. finally fixed zyn for msvc

    Rossmaxx committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    cf40e74 View commit details
    Browse the repository at this point in the history