Merge branch 'main' into library-controls-color-selector

Co-authored-by: ronso0 <ronso0@mixxx.org>
mixxxdj · Sep 29, 2024 · e70da63 · e70da63
2 parents a091a4f + 20b6fc6
commit e70da63
Show file tree

Hide file tree

Showing 77 changed files with 2,022 additions and 2,794 deletions.
diff --git a/CHANGELOG.md.backup b/CHANGELOG.md.backup
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2101,6 +2101,7 @@ add_executable(mixxx-test
   src/test/imageutils_test.cpp
   src/test/indexrange_test.cpp
   src/test/itunesxmlimportertest.cpp
+  src/test/keyfactorytest.cpp
   src/test/keyutilstest.cpp
   src/test/lcstest.cpp
   src/test/learningutilstest.cpp
@@ -3467,6 +3468,7 @@ if (STEM)
     src/sources/soundsourcestem.cpp
     src/track/steminfoimporter.cpp
     src/track/steminfo.cpp
+    src/widget/wstemlabel.cpp
   )
   if(QOPENGL)
     target_sources(mixxx-lib PRIVATE