diff --git a/src/kcm/package/contents/ui/Advanced.qml b/src/kcm/package/contents/ui/Advanced.qml --- a/src/kcm/package/contents/ui/Advanced.qml +++ b/src/kcm/package/contents/ui/Advanced.qml @@ -20,13 +20,14 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.3 +import QtQuick.Controls 1.3 as QQC1 +import QtQuick.Controls 2.0 import org.kde.plasma.private.volume 0.1 import org.kde.kcoreaddons 1.0 as KCoreAddons -ScrollView { +QQC1.ScrollView { id: scrollView ColumnLayout { diff --git a/src/kcm/package/contents/ui/Applications.qml b/src/kcm/package/contents/ui/Applications.qml --- a/src/kcm/package/contents/ui/Applications.qml +++ b/src/kcm/package/contents/ui/Applications.qml @@ -21,11 +21,12 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.3 +import QtQuick.Controls 1.3 as QQC1 +import QtQuick.Controls 2.0 import org.kde.plasma.private.volume 0.1 -ScrollView { +QQC1.ScrollView { id: scrollView anchors.fill: parent diff --git a/src/kcm/package/contents/ui/CardListItem.qml b/src/kcm/package/contents/ui/CardListItem.qml --- a/src/kcm/package/contents/ui/CardListItem.qml +++ b/src/kcm/package/contents/ui/CardListItem.qml @@ -19,7 +19,7 @@ */ import QtQuick 2.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Layouts 1.0 import org.kde.kquickcontrolsaddons 2.0 diff --git a/src/kcm/package/contents/ui/DeviceComboBox.qml b/src/kcm/package/contents/ui/DeviceComboBox.qml --- a/src/kcm/package/contents/ui/DeviceComboBox.qml +++ b/src/kcm/package/contents/ui/DeviceComboBox.qml @@ -20,7 +20,7 @@ */ import QtQuick 2.0 -import QtQuick.Controls 1.3 +import QtQuick.Controls 2.0 ComboBox { onModelChanged: updateIndex() diff --git a/src/kcm/package/contents/ui/DeviceListItem.qml b/src/kcm/package/contents/ui/DeviceListItem.qml --- a/src/kcm/package/contents/ui/DeviceListItem.qml +++ b/src/kcm/package/contents/ui/DeviceListItem.qml @@ -19,7 +19,7 @@ */ import QtQuick 2.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Layouts 1.0 import org.kde.kquickcontrolsaddons 2.0 diff --git a/src/kcm/package/contents/ui/Devices.qml b/src/kcm/package/contents/ui/Devices.qml --- a/src/kcm/package/contents/ui/Devices.qml +++ b/src/kcm/package/contents/ui/Devices.qml @@ -20,9 +20,10 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.3 +import QtQuick.Controls 1.3 as QQC1 +import QtQuick.Controls 2.0 -ScrollView { +QQC1.ScrollView { id: scrollView ColumnLayout { diff --git a/src/kcm/package/contents/ui/Header.qml b/src/kcm/package/contents/ui/Header.qml --- a/src/kcm/package/contents/ui/Header.qml +++ b/src/kcm/package/contents/ui/Header.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.3 +import QtQuick.Controls 2.0 ColumnLayout { property alias text: heading.text diff --git a/src/kcm/package/contents/ui/StreamListItem.qml b/src/kcm/package/contents/ui/StreamListItem.qml --- a/src/kcm/package/contents/ui/StreamListItem.qml +++ b/src/kcm/package/contents/ui/StreamListItem.qml @@ -19,7 +19,7 @@ */ import QtQuick 2.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Layouts 1.0 import org.kde.kquickcontrolsaddons 2.0 diff --git a/src/kcm/package/contents/ui/VolumeSlider.qml b/src/kcm/package/contents/ui/VolumeSlider.qml --- a/src/kcm/package/contents/ui/VolumeSlider.qml +++ b/src/kcm/package/contents/ui/VolumeSlider.qml @@ -20,7 +20,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 2.0 import org.kde.plasma.private.volume 0.1 @@ -38,8 +38,8 @@ property bool ignoreValueChange: true Layout.fillWidth: true - minimumValue: PulseAudio.MinimalVolume - maximumValue: PulseAudio.MaximalVolume + from: PulseAudio.MinimalVolume + to: PulseAudio.MaximalVolume visible: HasVolume enabled: VolumeWritable opacity: Muted ? 0.5 : 1 diff --git a/src/kcm/package/contents/ui/main.qml b/src/kcm/package/contents/ui/main.qml --- a/src/kcm/package/contents/ui/main.qml +++ b/src/kcm/package/contents/ui/main.qml @@ -19,7 +19,8 @@ */ import QtQuick 2.1 -import QtQuick.Controls 1.3 +import QtQuick.Controls 1.3 as QQC1 +import QtQuick.Controls 2.0 import org.kde.kcm 1.0 import org.kde.plasma.core 2.0 as PlasmaCore /* for units.gridUnit */ @@ -56,19 +57,19 @@ } } - TabView { + QQC1.TabView { id: tabView anchors.fill: parent - Tab { + QQC1.Tab { title: i18nc("@title:tab", "Devices") Devices {} } - Tab { + QQC1.Tab { title: i18nc("@title:tab", "Applications") Applications {} } - Tab { + QQC1.Tab { title: i18nc("@title:tab", "Advanced") Advanced {} }