summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-01-19 14:35:42 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-02-05 15:44:20 +0000
commitb61f1d0e08779f02eedcf79b6832ae578346ca1b (patch)
treeb2b0c5d3ee43f34423024fd73fb32973f9e4519f
parent716079fdf899898ad144b92520a318da54dff558 (diff)
Change the type of alias to runtime dependency
These aliased recipe which installs configuration files are used on runtime, not used on build time. So these recipes should be aliased as runtime dependency. Change-Id: I13146a55dfdb4e0a37818d430fb7ef286acf6077 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat
-rw-r--r--meta-audio-soundmanager-framework/recipes-multimedia/audiomanager-plugins-config-soundmanager/audiomanager-plugins-config-soundmanager_7.4.bb2
-rw-r--r--meta-audio-soundmanager-framework/recipes-multimedia/pulseaudio-config-soundmanager/pulseaudio-config-soundmanager_1.0.bb2
-rw-r--r--templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc4
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-audio-soundmanager-framework/recipes-multimedia/audiomanager-plugins-config-soundmanager/audiomanager-plugins-config-soundmanager_7.4.bb b/meta-audio-soundmanager-framework/recipes-multimedia/audiomanager-plugins-config-soundmanager/audiomanager-plugins-config-soundmanager_7.4.bb
index 6c3bf26e..7a1b05a6 100644
--- a/meta-audio-soundmanager-framework/recipes-multimedia/audiomanager-plugins-config-soundmanager/audiomanager-plugins-config-soundmanager_7.4.bb
+++ b/meta-audio-soundmanager-framework/recipes-multimedia/audiomanager-plugins-config-soundmanager/audiomanager-plugins-config-soundmanager_7.4.bb
@@ -37,4 +37,4 @@ do_install() {
install -m 644 ${WORKDIR}/customtypes.xsd ${D}${sysconfdir}/audiomanager/control/
}
-PROVIDES_${PN} += "virtual/audiomanager-plugins-config"
+RPROVIDES_${PN} += "virtual/audiomanager-plugins-config"
diff --git a/meta-audio-soundmanager-framework/recipes-multimedia/pulseaudio-config-soundmanager/pulseaudio-config-soundmanager_1.0.bb b/meta-audio-soundmanager-framework/recipes-multimedia/pulseaudio-config-soundmanager/pulseaudio-config-soundmanager_1.0.bb
index 52a3e8e6..691cc66b 100644
--- a/meta-audio-soundmanager-framework/recipes-multimedia/pulseaudio-config-soundmanager/pulseaudio-config-soundmanager_1.0.bb
+++ b/meta-audio-soundmanager-framework/recipes-multimedia/pulseaudio-config-soundmanager/pulseaudio-config-soundmanager_1.0.bb
@@ -9,4 +9,4 @@ do_install () {
install -m 0644 ${WORKDIR}/soundmanager.pa ${D}${sysconfdir}/pulse/default.d/
}
-PROVIDES_${PN} += "virtual/pulseaudio-config"
+RPROVIDES_${PN} += "virtual/pulseaudio-config"
diff --git a/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc b/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc
index 908ece39..359928df 100644
--- a/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc
+++ b/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc
@@ -1,4 +1,4 @@
DISTRO_FEATURES_append = " agl-audio-soundmanager-framework"
PREFERRED_PROVIDER_virtual/audio-framework = "agl-service-audio-soundmanager"
-PREFERRED_PROVIDER_virtual/pulseaudio-config = "pulseaudio-config-soundmanager"
-PREFERRED_PROVIDER_virtual/audiomanager-plugins-config = "audiomanager-plugins-config-soundmanager"
+PREFERRED_RPROVIDER_virtual/pulseaudio-config = "pulseaudio-config-soundmanager"
+PREFERRED_RPROVIDER_virtual/audiomanager-plugins-config = "audiomanager-plugins-config-soundmanager"
/* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
/*
 * Copyright (C) 2016 The Qt Company Ltd.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import AGL.Demo.Controls 1.0
import '..'

SettingPage {
    id: root
    icon: '/example/images/HMI_Settings_Example.svg'
    title: 'Example'
    checkable: true

    ColumnLayout {
        anchors.fill: parent
        anchors.margins: 100
        RowLayout {
            spacing: 20
            Button {
                text: 'Wifi'
                highlighted: true
                property int index: 0
                property var icons: ['HMI_Status_Wifi_NoBars-01', 'HMI_Status_Wifi_1Bar-01', 'HMI_Status_Wifi_2Bars-01', 'HMI_Status_Wifi_3Bars-01', 'HMI_Status_Wifi_Full-01']
                onClicked: {
                    index = (index + 1) % icons.length
                    setStatusIcon(0, 'qrc:/images/Status/%1.png'.arg(icons[index]))
                }
            }
            Button {
                text: 'Bluetooth'
                property int index: 0
                property var icons: ['HMI_Status_Bluetooth_Inactive-01', 'HMI_Status_Bluetooth_On-01']
                onClicked: {
                    index = (index + 1) % icons.length
                    setStatusIcon(1, 'qrc:/images/Status/%1.png'.arg(icons[index]))
                }
            }
            Button {
                text: 'Signal'
                property int index: 0
                property var icons: ['HMI_Status_Signal_NoBars-01', 'HMI_Status_Signal_1Bars-01', 'HMI_Status_Signal_2Bars-01', 'HMI_Status_Signal_3Bars-01', 'HMI_Status_Signal_4Bars-01', 'HMI_Status_Signal_Full-01']
                onClicked: {
                    index = (index + 1) % icons.length
                    setStatusIcon(2, 'qrc:/images/Status/%1.png'.arg(icons[index]))
                }
            }
        }

        Image {
            source: '../images/HMI_Settings_DividingLine.svg'
        }

        ListView {
            Layout.fillWidth: true
            Layout.fillHeight: true
            clip: true
            model: 10
            delegate: MouseArea {
                width: ListView.view.width
                height: 110
                RowLayout {
                    anchors.fill: parent
                    anchors.margins: 5
                    spacing: 30
                    Image {
                        source: './images/HMI_Settings_Example.svg'
                    }

                    ColumnLayout {
                        Label {
                            id: title
                            Layout.fillWidth: true
                            text: 'Title'
                            font.pixelSize: 48
                        }
                        Label {
                            id: subtitle
                            Layout.fillWidth: true
                            text: 'Subtitle'
                            color: '#66FF99'
                            font.pixelSize: 24
                        }
                    }

                    Button {
                        text: 'Go'
                    }
                }

                Image {
                    source: '../images/HMI_Settings_DividingLine.svg'
                    anchors.horizontalCenter: parent.horizontalCenter
                    anchors.top: parent.top
                    visible: model.index > 0
                }
            }
        }
    }
}