From 40c2d9a06bfa3adb4670fdc2e5bef7659d83bd04 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Thu, 2 Dec 2021 12:05:31 +0100 Subject: [PATCH] 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: Reviewed-by: Tim Jenssen --- .../QtMultimedia/AudioSection.qml | 67 ------------------ .../qtquickplugin/images/audio-16px.png | Bin 267 -> 0 bytes .../qtquickplugin/images/audio-24px.png | Bin 521 -> 0 bytes .../qtquickplugin/images/audio-24px@2x.png | Bin 1026 -> 0 bytes .../qtquickplugin/qtquickplugin.qrc | 4 -- .../qmldesigner/qtquickplugin/quick.metainfo | 22 ------ .../qtquickplugin/source/audio.qml | 35 --------- 7 files changed, 128 deletions(-) delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioSection.qml delete mode 100644 src/plugins/qmldesigner/qtquickplugin/images/audio-16px.png delete mode 100644 src/plugins/qmldesigner/qtquickplugin/images/audio-24px.png delete mode 100644 src/plugins/qmldesigner/qtquickplugin/images/audio-24px@2x.png delete mode 100644 src/plugins/qmldesigner/qtquickplugin/source/audio.qml diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioSection.qml deleted file mode 100644 index db226e755a9..00000000000 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioSection.qml +++ /dev/null @@ -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 {} - } - } -} diff --git a/src/plugins/qmldesigner/qtquickplugin/images/audio-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/audio-16px.png deleted file mode 100644 index d9fd2f57bf4498e4abbbbfd4645bfa62e272bdbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4i*LmhONKMUokK+T=H~r4AD5>I&nX@W1z@! zeL+_Zv%$%fP@7I6)bCt#Yr*nS) zy>rg?`KsB!bb}upS-y`w^V*mBmDA?@%$qsegZn7N%u0I8OQzxj}t_grVr$ zdEb~<6sfwpt(sIN>85aGnqgVk79B=MsYyFu8vbN6*?D3!JI~taBbJwss`dt4S<(GW z-l0|5kSplvSHrzg;j#rMCkUG9e3S^E`ZysXq+M9^^Qy&X;vD9*T+P2xFr)8Z?RVJ= YF%LrTFVdQ&MBb@0DvcRdjJ3c diff --git a/src/plugins/qmldesigner/qtquickplugin/images/audio-24px.png b/src/plugins/qmldesigner/qtquickplugin/images/audio-24px.png deleted file mode 100644 index 9e477c806db00f9ddc7552df5db78f6d551c6887..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoFL=5*hIn*dy=I*)8Ysg0 z;Qc)guNnuIgKBOY1%!@>BXX~w>>MYv9Qm!UP#RNriL~6D+nJM15 zv0{Nxi-{7)v1~(iA-$PT+OoOKd7huK%f2@2c-(KF#aFW;PiL&tw3b@Un4TtFJEObf z{@j?$AB9t%2`u}_>z-xscjnE_S&e6G+OJFKtemH6@c2i^@|ibpPjpDjJ9kFYXHmJO zj@h(AmhVQJH?DC=<9n>@x6WaY!1al#bt2*mCeD1lVI^-3*Yyqi+TKLC*qk|IcjtKe zoN&>z(mW5f%S=Bq73Us5V)UdtS)#o_DqQ)I`noAw-&))`a*eO!)gw{4=|7*Ixznru zBcMn*R&s4cqRjq~siihbQ5BI2&9T;&O8Zv)as2x3VX)-(zpukC-n$VM%boI!?~V5I z_or^eAG^7Z#VdNp(odIdbP0l+XkKxDV|Q diff --git a/src/plugins/qmldesigner/qtquickplugin/images/audio-24px@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/audio-24px@2x.png deleted file mode 100644 index 41948718fd106fedca16814c3235746ecd293604..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4rT@hhJ-tuTNxM_%L9BuTp1V`{{R2KVieFf z1o~zc|6yQYs3{5Z3ua(oWMXDvW9Q=K;};MV5*87YkdakTR?*PZ($P0CF|)L?v9ot{ zcJuJ|^$Q3NNk~jiOV7wFC@QP0u4!m&YH9E2>gk;@anj@|Q)kSbw|MD_HETC*-o9h! zu08t>96ojC{N*b*Zr;B0;Nhbu&tJTJ{pQ`L&tJZN`~KtC?>~S4O?+#$oq>UIpQnps zh{y4#*KP)14iGv1aem-ME-sBN57>en*DUH#;NU7{6c=+{yXac4YtF&F0vY@3_wbv{ z%-lA6-=oS?KIhVl{EOaOUTm~-{>|9pa{bi$xTE~pSK40w_<45y0Y{!{O7AK)*MZgASH|Mx;jtHOe62Aj{%=AUvl zxS+!@J?pdn{{#F+-JfMAN!c;gY*1OfcCQrw0sdXuANB@cnkm~*_tG@c@a?qSvkJtv zY6$YOF;pn6+{<*MS1rMo{f4h+6?4H=mXarvi)~p9l38|f1Z-I%a=_a7f_Q`9$zRMO zNe%4`*HvoSybKR;9N4hL#(~Fxt6(#q0kc6s?4|b-3A_(Vw!T=OHi7X*NnG|h4xwy@ z{<-|+_gSRwF-^I<_F_KMb;gQUIr}aJ?(JX`W;p%sTik?_HJSQ-_chrYHk*kAzhm^e zUe=T3a8Ximages/text-edit-icon16.png images/text-input-icon16.png images/webview-icon16.png - source/audio.qml source/listview.qml source/listviewv2.qml source/gridview.qml @@ -84,9 +83,6 @@ images/loader-icon.png images/loader-icon@2x.png images/loader-icon16.png - images/audio-16px.png - images/audio-24px.png - images/audio-24px@2x.png images/audio-output-16px.png images/audio-output-24px.png images/audio-output-24px@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo index ef81ae181bf..d21d8420b4b 100644 --- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo +++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo @@ -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 { name: "QtMultimedia.AudioOutput" icon: ":/qtquickplugin/images/audio-output-16px.png" diff --git a/src/plugins/qmldesigner/qtquickplugin/source/audio.qml b/src/plugins/qmldesigner/qtquickplugin/source/audio.qml deleted file mode 100644 index b3d1347e85e..00000000000 --- a/src/plugins/qmldesigner/qtquickplugin/source/audio.qml +++ /dev/null @@ -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 - } -}