Fix qml Audio/Video support in qt6 too.
in Audio qt6 we don't have autoload feature but we disable it in qt5 => it seems ok In Video qml qt6 we don't have flushMode.
This commit is contained in:
@@ -53,11 +53,21 @@ if(QT_MAJOR_VERSION STREQUAL "6")
|
|||||||
set(OVERLAYSHEET_OPEN "onOpened")
|
set(OVERLAYSHEET_OPEN "onOpened")
|
||||||
set(QTQUICK_MODULE_QML_VERSION "")
|
set(QTQUICK_MODULE_QML_VERSION "")
|
||||||
set(QTLOCATION_MODULE_QML_VERSION "")
|
set(QTLOCATION_MODULE_QML_VERSION "")
|
||||||
|
set(QTMULTIMEDIA_MODULE_QML_VERSION "")
|
||||||
|
set(QTMULTIMEDIA_AUDIO "MediaPlayer")
|
||||||
|
# in Audio qt6 we don't have it but we disable it in qt5 => it seems ok
|
||||||
|
set(QTMULTIMEDIA_AUDIO_AUTOLOAD "")
|
||||||
|
# In Video qml qt6 we don't have it.
|
||||||
|
set(QTMULTIMEDIA_VIDEO_FLUSHMODE "")
|
||||||
else()
|
else()
|
||||||
set(BASICLISTITEM_BOLD "bold")
|
set(BASICLISTITEM_BOLD "bold")
|
||||||
set(OVERLAYSHEET_OPEN "onSheetOpenChanged")
|
set(OVERLAYSHEET_OPEN "onSheetOpenChanged")
|
||||||
set(QTQUICK_MODULE_QML_VERSION "2.15")
|
set(QTQUICK_MODULE_QML_VERSION "2.15")
|
||||||
set(QTLOCATION_MODULE_QML_VERSION "5.15")
|
set(QTLOCATION_MODULE_QML_VERSION "5.15")
|
||||||
|
set(QTMULTIMEDIA_MODULE_QML_VERSION "5.15")
|
||||||
|
set(QTMULTIMEDIA_AUDIO "Audio")
|
||||||
|
set(QTMULTIMEDIA_AUDIO_AUTOLOAD "autoLoad: false")
|
||||||
|
set(QTMULTIMEDIA_VIDEO_FLUSHMODE "flushMode: VideoOutput.FirstFrame")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
|
set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qm
|
|||||||
configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
|
configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
|
||||||
configure_file(qml/Dialog/UserDetailDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/UserDetailDialog.qml)
|
configure_file(qml/Dialog/UserDetailDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/UserDetailDialog.qml)
|
||||||
configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
|
configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
|
||||||
|
configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
|
||||||
|
configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
|
||||||
configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
|
configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
|
||||||
|
|
||||||
configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)
|
configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
import QtQuick 2.15
|
import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15 as QQC2
|
import QtQuick.Controls 2.15 as QQC2
|
||||||
import QtQuick.Layouts 1.15
|
import QtQuick.Layouts 1.15
|
||||||
import QtMultimedia 5.15
|
import QtMultimedia @QTMULTIMEDIA_MODULE_QML_VERSION@
|
||||||
|
|
||||||
import org.kde.kirigami 2.15 as Kirigami
|
import org.kde.kirigami 2.15 as Kirigami
|
||||||
|
|
||||||
@@ -42,10 +42,10 @@ TimelineContainer {
|
|||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.maximumWidth: root.contentMaxWidth
|
Layout.maximumWidth: root.contentMaxWidth
|
||||||
|
|
||||||
Audio {
|
@QTMULTIMEDIA_AUDIO@ {
|
||||||
id: audio
|
id: audio
|
||||||
source: root.progressInfo.localPath
|
source: root.progressInfo.localPath
|
||||||
autoLoad: false
|
@QTMULTIMEDIA_AUDIO_AUTOLOAD@
|
||||||
}
|
}
|
||||||
|
|
||||||
states: [
|
states: [
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
import QtQuick 2.15
|
import QtQuick 2.15
|
||||||
import QtQuick.Controls 2.15 as QQC2
|
import QtQuick.Controls 2.15 as QQC2
|
||||||
import QtQuick.Layouts 1.15
|
import QtQuick.Layouts 1.15
|
||||||
import QtMultimedia 5.15
|
import QtMultimedia @QTMULTIMEDIA_MODULE_QML_VERSION@
|
||||||
import Qt.labs.platform 1.1 as Platform
|
import Qt.labs.platform 1.1 as Platform
|
||||||
|
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
@@ -124,7 +124,7 @@ TimelineContainer {
|
|||||||
Layout.preferredHeight: videoHeight
|
Layout.preferredHeight: videoHeight
|
||||||
|
|
||||||
fillMode: VideoOutput.PreserveAspectFit
|
fillMode: VideoOutput.PreserveAspectFit
|
||||||
flushMode: VideoOutput.FirstFrame
|
@QTMULTIMEDIA_VIDEO_FLUSHMODE@
|
||||||
|
|
||||||
states: [
|
states: [
|
||||||
State {
|
State {
|
||||||
|
|||||||
@@ -48,10 +48,10 @@
|
|||||||
<file alias="RichLabel.qml">qml/Component/Timeline/RichLabel.qml</file>
|
<file alias="RichLabel.qml">qml/Component/Timeline/RichLabel.qml</file>
|
||||||
<file alias="TimelineContainer.qml">qml/Component/Timeline/TimelineContainer.qml</file>
|
<file alias="TimelineContainer.qml">qml/Component/Timeline/TimelineContainer.qml</file>
|
||||||
<file alias="SectionDelegate.qml">qml/Component/Timeline/SectionDelegate.qml</file>
|
<file alias="SectionDelegate.qml">qml/Component/Timeline/SectionDelegate.qml</file>
|
||||||
<file alias="VideoDelegate.qml">qml/Component/Timeline/VideoDelegate.qml</file>
|
<file alias="VideoDelegate.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Component/Timeline/VideoDelegate.qml</file>
|
||||||
<file alias="ReactionDelegate.qml">qml/Component/Timeline/ReactionDelegate.qml</file>
|
<file alias="ReactionDelegate.qml">qml/Component/Timeline/ReactionDelegate.qml</file>
|
||||||
<file alias="LinkPreviewDelegate.qml">qml/Component/Timeline/LinkPreviewDelegate.qml</file>
|
<file alias="LinkPreviewDelegate.qml">qml/Component/Timeline/LinkPreviewDelegate.qml</file>
|
||||||
<file alias="AudioDelegate.qml">qml/Component/Timeline/AudioDelegate.qml</file>
|
<file alias="AudioDelegate.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Component/Timeline/AudioDelegate.qml</file>
|
||||||
<file alias="FileDelegate.qml">qml/Component/Timeline/FileDelegate.qml</file>
|
<file alias="FileDelegate.qml">qml/Component/Timeline/FileDelegate.qml</file>
|
||||||
<file alias="ImageDelegate.qml">qml/Component/Timeline/ImageDelegate.qml</file>
|
<file alias="ImageDelegate.qml">qml/Component/Timeline/ImageDelegate.qml</file>
|
||||||
<file alias="EncryptedDelegate.qml">qml/Component/Timeline/EncryptedDelegate.qml</file>
|
<file alias="EncryptedDelegate.qml">qml/Component/Timeline/EncryptedDelegate.qml</file>
|
||||||
|
|||||||
Reference in New Issue
Block a user