Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,14 @@ endif()
include(CMakeDependentOption)

option(QT6 "Build with Qt6" ON)
cmake_dependent_option(
QML
"Build with QML"
ON
"QT6"
OFF
)

# Because of multiple concurrent definition of symbols caused by the rendergraph
# compile definition we need to disable QML by default. This avoids the risk of
# undefined behaviour in a stable build.
# See: https://github.com/mixxxdj/mixxx/issues/14766
# Once this is fixed we can revert the commit introducing this.
option(QML "Build with QML" OFF)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's overwrite this default in build.yml. Otherwise CI would no longer detect, if someone commits a change that breaks QML.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fully agree with creating the PPA builds without QML, but the GitHub CI builds of the 2.6 branch, and the PRs targeted to, it must have QML always enabled. This is important so that no one unknowingly adds a PR to 2.6, that breaks the main build after merging.

To my understanding this behavior can easily be achieved by setting the default in CMakeLists.txt to OFF and overwrite it with ON in build.yml and build-checks.yml.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to have this type of undefined behavior in our beta builds provided on our download page. This is IMHO more important than the unlikely case that something QML related is pushed to the 2.6 branch.

I expect that one of use will quickly find the root cause so that this situation is only temporary anyway.


option(QOPENGL "Use QOpenGLWindow based widget instead of QGLWidget" ON)

if(QOPENGL)
Expand Down