Skip to content

Commit 042568c

Browse files
authored
Merge pull request #7583 from nextcloud/bugfix/remove-bcc
gui/tray: Remove BasicComboBox QML component, prefer native component
2 parents 305ae10 + 1c68012 commit 042568c

File tree

3 files changed

+1
-101
lines changed

3 files changed

+1
-101
lines changed

resources.qrc

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<file>src/gui/EmojiPicker.qml</file>
66
<file>src/gui/UserStatusSelectorButton.qml</file>
77
<file>src/gui/PredefinedStatusButton.qml</file>
8-
<file>src/gui/BasicComboBox.qml</file>
98
<file>src/gui/ErrorBox.qml</file>
109
<file>src/gui/filedetails/FileActivityView.qml</file>
1110
<file>src/gui/filedetails/FileDetailsPage.qml</file>

src/gui/BasicComboBox.qml

-99
This file was deleted.

src/gui/UserStatusSelector.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ ColumnLayout {
293293
wrapMode: Text.Wrap
294294
}
295295

296-
BasicComboBox {
296+
ComboBox {
297297
id: clearComboBox
298298

299299
Layout.fillWidth: true

0 commit comments

Comments
 (0)