WIP - Cleanup

CMakeLists.txt

@@ -1422,9 +1422,6 @@ if(QT6)
 else()
   add_executable(mixxx WIN32 src/main.cpp)
 endif()
-# ugly hack to get #include "preferences/dialog/ui_dlgpreferencesdlg.h" to work in
-# src/qmldlgpreferencesproxy.h, which is #included from src/qmlapplication.h.
-target_include_directories(mixxx PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/mixxx-lib_autogen/include")
 set_target_properties(mixxx-lib PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY}")
 target_link_libraries(mixxx PRIVATE mixxx-lib mixxx-gitinfostore)
 
@@ -2366,7 +2363,7 @@ if(QML)
   # See: https://bugreports.qt.io/browse/QTBUG-87221
   target_include_directories(${MIXXX_QML_LIB} PRIVATE src/control src/qml)
   if (NOT QML_UI)
-    target_include_directories(${MIXXX_QML_LIB} PRIVATE src/ "${CMAKE_CURRENT_BINARY_DIR}/mixxx-lib_autogen/include" ${CMAKE_BINARY_DIR}/src)
+    target_include_directories(${MIXXX_QML_LIB} PRIVATE src/ ${CMAKE_BINARY_DIR}/src)
     target_include_directories(${MIXXX_QML_LIB} SYSTEM PUBLIC lib/rigtorp/SPSCQueue/include lib/portaudio)
   endif()
   target_link_libraries(${MIXXX_QML_LIB} PRIVATE ${MIXXX_QML_LIB}plugin)

res/controllers/Dummy Device Screen.hid.xml

@@ -10,14 +10,12 @@
     </info>
     <controller id="DummyDevice">
         <screens>
-            <screen identifier="leftdeck" width="320" height="240" targetFps="5" pixelType="RBG565" />
-            <screen identifier="rightdeck" width="320" height="240" targetFps="5" pixelType="RBG565" />
+            <screen identifier="main" width="480" height="360" targetFps="20" pixelType="RBGA" splashoff="2000" />
         </screens>
         <scriptfiles>
             <file filename="DummyDeviceDefaultScreen.qml" />
         </scriptfiles>
         <qmllibraries>
-            <library path="Dummy-Device-Default-Screen" />
         </qmllibraries>
     </controller>
 </MixxxControllerPreset>