Skip to content
Open
Show file tree
Hide file tree
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
58 changes: 58 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3758,6 +3758,7 @@ if(QML)
list(APPEND QT_EXTRA_COMPONENTS "Quick")
list(APPEND QT_EXTRA_COMPONENTS "QuickControls2")
list(APPEND QT_EXTRA_COMPONENTS "QuickControls2Impl")
list(APPEND QT_EXTRA_COMPONENTS "QuickDialogs2")
list(APPEND QT_EXTRA_COMPONENTS "QuickLayouts")
list(APPEND QT_EXTRA_COMPONENTS "QuickShapesPrivate")
list(APPEND QT_EXTRA_COMPONENTS "QuickTemplates2")
Expand Down Expand Up @@ -4219,6 +4220,42 @@ else()
applocal
)

install(
IMPORTED_RUNTIME_ARTIFACTS
Qt${QT_VERSION_MAJOR}::Multimedia
DESTINATION
"${MIXXX_INSTALL_DATADIR}"
COMPONENT
applocal
)

install(
IMPORTED_RUNTIME_ARTIFACTS
Qt${QT_VERSION_MAJOR}::QuickDialogs2
DESTINATION
"${MIXXX_INSTALL_DATADIR}"
COMPONENT
applocal
)

install(
IMPORTED_RUNTIME_ARTIFACTS
Qt${QT_VERSION_MAJOR}::QuickDialogs2QuickImpl
DESTINATION
"${MIXXX_INSTALL_DATADIR}"
COMPONENT
applocal
)

install(
IMPORTED_RUNTIME_ARTIFACTS
Qt${QT_VERSION_MAJOR}::QuickDialogs2Utils
DESTINATION
"${MIXXX_INSTALL_DATADIR}"
COMPONENT
applocal
)

#install qml6-module-qt5compat-graphicaleffects
install(
DIRECTORY
Expand All @@ -4234,6 +4271,13 @@ else()
DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml"
COMPONENT applocal
)
# Qt6MultimediaQuick doesn't seem to be included in any defined target but it is required.
install(
DIRECTORY
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin/Qt6MultimediaQuick$<$<CONFIG:Debug>:d>${CMAKE_SHARED_LIBRARY_SUFFIX}"
DESTINATION "${MIXXX_INSTALL_DATADIR}"
COMPONENT applocal
)

# install qml6-module-qtqml-workerscript
install(
Expand All @@ -4251,6 +4295,14 @@ else()
COMPONENT applocal
)

# install qml6-module-qtquick-dialogs
install(
DIRECTORY
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/Qt6/qml/QtQuick/Dialogs"
DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml/QtQuick"
COMPONENT applocal
)

# install qml6-module-qtquick-layouts
install(
DIRECTORY
Expand Down Expand Up @@ -5144,6 +5196,9 @@ if(HID)
)
endif()
target_compile_definitions(mixxx-lib PUBLIC __HID__)
if(QML)
target_compile_definitions(mixxx-qml-lib PUBLIC __HID__)
endif()
endif()

# USB Bulk controller support
Expand Down Expand Up @@ -5171,6 +5226,9 @@ if(BULK)
endif()
target_compile_definitions(mixxx-lib PUBLIC __BULK__)
target_link_libraries(mixxx-lib PRIVATE LibUSB::LibUSB)
if(QML)
target_compile_definitions(mixxx-qml-lib PUBLIC __BULK__)
endif()
endif()

# Vinyl Control
Expand Down
1 change: 1 addition & 0 deletions packaging/debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 11),
qml6-module-qtmultimedia,
qml6-module-qtqml-workerscript,
qml6-module-qtquick-controls,
qml6-module-qtquick-dialogs,
qml6-module-qtquick-layouts,
qml6-module-qtquick-shapes,
qml6-module-qtquick-templates,
Expand Down
8 changes: 8 additions & 0 deletions res/controllers/Dummy Device Screen.hid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
<value color="#FFFFFF" label="White">white</value>
</option>
</row>
<option
variable="intValue"
type="integer"
min="20"
max="500"
step="2"
default="50"
label="Int value"/>
</group>
</settings>
<controller id="DummyDevice">
Expand Down
Loading
Loading