ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QML Qt5/Qt6 compatibility hacks

Browse Source
This commit is contained in:
Tobias Fella
2023-09-13 14:03:34 +02:00
parent f542d0b9fd
commit 823f3cdd4e
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qml/Component/Timeline/AudioDelegate.qml
View File

@@ -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 @QTMULTIMEDIA_MODULE_QML_VERSION@ import QtMultimedia
import org.kde.kirigami 2.15 as Kirigami import org.kde.kirigami 2.15 as Kirigami
@@ -42,10 +42,9 @@ TimelineContainer {
Layout.fillWidth: true Layout.fillWidth: true
Layout.maximumWidth: root.contentMaxWidth Layout.maximumWidth: root.contentMaxWidth
@QTMULTIMEDIA_AUDIO@ { MediaPlayer {
id: audio id: audio
source: root.progressInfo.localPath source: root.progressInfo.localPath
@QTMULTIMEDIA_AUDIO_AUTOLOAD@
} }
states: [ states: [

4
src/qml/Component/Timeline/OsmLocationPlugin.qml
View File

@@ -3,8 +3,8 @@
pragma Singleton pragma Singleton
import QtQuick @QTQUICK_MODULE_QML_VERSION@ import QtQuick
import QtLocation @QTLOCATION_MODULE_QML_VERSION@ import QtLocation
QtObject { QtObject {
property var plugin: Plugin { property var plugin: Plugin {

3
src/qml/Component/Timeline/VideoDelegate.qml
View File

@@ -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 @QTMULTIMEDIA_MODULE_QML_VERSION@ import QtMultimedia
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
@@ -73,7 +73,6 @@ TimelineContainer {
Layout.preferredHeight: mediaSizeHelper.currentSize.height Layout.preferredHeight: mediaSizeHelper.currentSize.height
fillMode: VideoOutput.PreserveAspectFit fillMode: VideoOutput.PreserveAspectFit
@QTMULTIMEDIA_VIDEO_FLUSHMODE@
states: [ states: [
State { State {

2
src/qml/Dialog/PowerLevelDialog.qml
View File

@@ -17,7 +17,7 @@ Kirigami.OverlaySheet {
property var userId property var userId
property int powerLevel property int powerLevel
@OVERLAYSHEET_OPEN@: { onOpened: {
if (sheetOpen) { if (sheetOpen) {
powerLevelComboBox.currentIndex = powerLevelComboBox.indexOfValue(root.powerLevel) powerLevelComboBox.currentIndex = powerLevelComboBox.indexOfValue(root.powerLevel)
} }