diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml index 2ad1f62f1f1fec8f96e8bdb2e1442261be0d9bdb..ca0bbfdc913da869723896cd3eec0b0655d88aac 100644 --- a/src/commoncomponents/ListViewJami.qml +++ b/src/commoncomponents/ListViewJami.qml @@ -46,6 +46,6 @@ Rectangle { clip: true maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } } diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml index 3a93ad7b5bb08c2cf0e5e3e9ebfdc3f67825362c..f7aede36fd8bf15a9a4dd561e4c27a60a2c78420 100644 --- a/src/commoncomponents/SettingParaCombobox.qml +++ b/src/commoncomponents/SettingParaCombobox.qml @@ -122,7 +122,7 @@ ComboBox { model: root.delegateModel currentIndex: root.highlightedIndex - ScrollIndicator.vertical: ScrollIndicator { } + ScrollBar.vertical: ScrollBar { } } background: Rectangle { diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml index 8a9cf094b977c6ef34126c72ce8c73e7bf8c8a60..7e499b0b4837efb6ff0536b753499a3cb66694b7 100644 --- a/src/mainview/components/AccountComboBoxPopup.qml +++ b/src/mainview/components/AccountComboBoxPopup.qml @@ -67,7 +67,7 @@ Popup { } } - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } // fake footer item as workaround for Qt 5.15 bug diff --git a/src/mainview/components/CallActionBar.qml b/src/mainview/components/CallActionBar.qml index 98809ddf3bf6dbb4522714cd9f540c615d4cfabb..3134419983e7238b350dd433dbaf34023e17dc8a 100644 --- a/src/mainview/components/CallActionBar.qml +++ b/src/mainview/components/CallActionBar.qml @@ -461,7 +461,7 @@ Control { null delegate: buttonDelegate - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } add: Transition { NumberAnimation { @@ -491,7 +491,7 @@ Control { overflowButton.delegateModel : null - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } background: Rectangle { diff --git a/src/mainview/components/CallButtonDelegate.qml b/src/mainview/components/CallButtonDelegate.qml index c636b5165347ea3273fa37dbb78191dc1a8780aa..0889055123cdd20afae395933fec3ea1963478c0 100644 --- a/src/mainview/components/CallButtonDelegate.qml +++ b/src/mainview/components/CallButtonDelegate.qml @@ -254,7 +254,7 @@ ItemDelegate { implicitWidth: menuItemWidth implicitHeight: Math.min(contentHeight, menuItemHeight * 6) + 24 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } clip: true diff --git a/src/mainview/components/ConversationListView.qml b/src/mainview/components/ConversationListView.qml index ebfd42167826e9f3e0d63ba4338ebe227705661e..c69949fcb9c22998b730fdc773e63ad28c482205 100644 --- a/src/mainview/components/ConversationListView.qml +++ b/src/mainview/components/ConversationListView.qml @@ -38,7 +38,7 @@ ListView { clip: true maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } // highlight selection // down and hover states are done within the delegate diff --git a/src/mainview/components/ParticipantCallInStatusView.qml b/src/mainview/components/ParticipantCallInStatusView.qml index 81790813dc361b22adbe64113795d8f7e6f20012..b8658eae4c8c263924b97cf59dc7b2223f92924a 100644 --- a/src/mainview/components/ParticipantCallInStatusView.qml +++ b/src/mainview/components/ParticipantCallInStatusView.qml @@ -56,5 +56,5 @@ ListView { clip: true maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml index 84dc516439b307c6374d5a308d2c16d271f1320b..f7f2ef7361f20e5d72cc801aa4cf7b20704f5873 100644 --- a/src/mainview/components/PluginHandlerPicker.qml +++ b/src/mainview/components/PluginHandlerPicker.qml @@ -170,7 +170,7 @@ Popup { } } - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } } } diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml index 775f581f77cb788e9674f3139ca7e10de01e3f42..75e783acdefa07f51d648dc85bae799bbd65bde2 100644 --- a/src/settingsview/SettingsView.qml +++ b/src/settingsview/SettingsView.qml @@ -172,7 +172,7 @@ Rectangle { width: settingsViewRect.width maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } clip: true contentHeight: rightSettingsStackLayout.height