QmlDesigner: Remove audio wrapper

Remove the custom audio convenience type which should mimic the QML
Video convenience type only for audio. The custom convenience wrapper is
not working, because MediaPlayer is a QObject and can't have children.

Change-Id: Ic8d06e6397d8b7bb3bc531d47c1cb0b92142a742
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Henning Gruendl
2021-12-02 12:05:31 +01:00
committed by Tim Jenssen
parent 9dd6635970
commit 40c2d9a06b
7 changed files with 0 additions and 128 deletions

View File

@@ -1,67 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
import QtQuick 2.15
import QtQuick.Layouts 1.15
import HelperWidgets 2.0
import StudioControls 1.0 as StudioControls
import StudioTheme 1.0 as StudioTheme
Section {
caption: qsTr("Audio")
anchors.left: parent.left
anchors.right: parent.right
SectionLayout {
PropertyLabel { text: qsTr("Volume") }
SecondColumnLayout {
SpinBox {
implicitWidth: StudioTheme.Values.twoControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
backendValue: backendValues.volume
decimals: 1
minimumValue: 0.0
maximumValue: 1.0
}
ExpandingSpacer {}
}
PropertyLabel { text: qsTr("Muted") }
SecondColumnLayout {
CheckBox {
implicitWidth: StudioTheme.Values.twoControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
backendValue: backendValues.muted
text: backendValues.muted.valueToString
}
ExpandingSpacer {}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 521 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -31,7 +31,6 @@
<file>images/text-edit-icon16.png</file> <file>images/text-edit-icon16.png</file>
<file>images/text-input-icon16.png</file> <file>images/text-input-icon16.png</file>
<file>images/webview-icon16.png</file> <file>images/webview-icon16.png</file>
<file>source/audio.qml</file>
<file>source/listview.qml</file> <file>source/listview.qml</file>
<file>source/listviewv2.qml</file> <file>source/listviewv2.qml</file>
<file>source/gridview.qml</file> <file>source/gridview.qml</file>
@@ -84,9 +83,6 @@
<file>images/loader-icon.png</file> <file>images/loader-icon.png</file>
<file>images/loader-icon@2x.png</file> <file>images/loader-icon@2x.png</file>
<file>images/loader-icon16.png</file> <file>images/loader-icon16.png</file>
<file>images/audio-16px.png</file>
<file>images/audio-24px.png</file>
<file>images/audio-24px@2x.png</file>
<file>images/audio-output-16px.png</file> <file>images/audio-output-16px.png</file>
<file>images/audio-output-24px.png</file> <file>images/audio-output-24px.png</file>
<file>images/audio-output-24px@2x.png</file> <file>images/audio-output-24px@2x.png</file>

View File

@@ -522,28 +522,6 @@ MetaInfo {
} }
} }
Type {
name: "QtMultimedia.MediaPlayer"
icon: ":/qtquickplugin/images/audio-16px.png"
Hints {
visibleInNavigator: true
canBeDroppedInNavigator: true
canBeDroppedInFormEditor: false
canBeContainer: false
}
ItemLibraryEntry {
name: "Audio"
category: "f.Qt Quick - Multimedia"
libraryIcon: ":/qtquickplugin/images/audio-24px.png"
version: "6.0"
requiredImport: "QtMultimedia"
QmlSource { source: ":/qtquickplugin/source/audio.qml" }
}
}
Type { Type {
name: "QtMultimedia.AudioOutput" name: "QtMultimedia.AudioOutput"
icon: ":/qtquickplugin/images/audio-output-16px.png" icon: ":/qtquickplugin/images/audio-output-16px.png"

View File

@@ -1,35 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
import QtQuick 2.0
import QtMultimedia 6.0
MediaPlayer {
audioOutput: output
AudioOutput {
id: output
}
}