Remove QML Qt5/Qt6 compatibility hacks
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15 as QQC2
|
||||
import QtQuick.Layouts 1.15
|
||||
import QtMultimedia @QTMULTIMEDIA_MODULE_QML_VERSION@
|
||||
import QtMultimedia
|
||||
|
||||
import org.kde.kirigami 2.15 as Kirigami
|
||||
|
||||
@@ -42,10 +42,9 @@ TimelineContainer {
|
||||
Layout.fillWidth: true
|
||||
Layout.maximumWidth: root.contentMaxWidth
|
||||
|
||||
@QTMULTIMEDIA_AUDIO@ {
|
||||
MediaPlayer {
|
||||
id: audio
|
||||
source: root.progressInfo.localPath
|
||||
@QTMULTIMEDIA_AUDIO_AUTOLOAD@
|
||||
}
|
||||
|
||||
states: [
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
pragma Singleton
|
||||
|
||||
import QtQuick @QTQUICK_MODULE_QML_VERSION@
|
||||
import QtLocation @QTLOCATION_MODULE_QML_VERSION@
|
||||
import QtQuick
|
||||
import QtLocation
|
||||
|
||||
QtObject {
|
||||
property var plugin: Plugin {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15 as QQC2
|
||||
import QtQuick.Layouts 1.15
|
||||
import QtMultimedia @QTMULTIMEDIA_MODULE_QML_VERSION@
|
||||
import QtMultimedia
|
||||
import Qt.labs.platform 1.1 as Platform
|
||||
|
||||
import org.kde.kirigami 2.13 as Kirigami
|
||||
@@ -73,7 +73,6 @@ TimelineContainer {
|
||||
Layout.preferredHeight: mediaSizeHelper.currentSize.height
|
||||
|
||||
fillMode: VideoOutput.PreserveAspectFit
|
||||
@QTMULTIMEDIA_VIDEO_FLUSHMODE@
|
||||
|
||||
states: [
|
||||
State {
|
||||
|
||||
@@ -17,7 +17,7 @@ Kirigami.OverlaySheet {
|
||||
property var userId
|
||||
property int powerLevel
|
||||
|
||||
@OVERLAYSHEET_OPEN@: {
|
||||
onOpened: {
|
||||
if (sheetOpen) {
|
||||
powerLevelComboBox.currentIndex = powerLevelComboBox.indexOfValue(root.powerLevel)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user