Skip to content

Commit

Permalink
Merge pull request #7583 from nextcloud/bugfix/remove-bcc
Browse files Browse the repository at this point in the history
gui/tray: Remove BasicComboBox QML component, prefer native component
  • Loading branch information
mgallien authored Jan 10, 2025
2 parents 305ae10 + 1c68012 commit 042568c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 101 deletions.
1 change: 0 additions & 1 deletion resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<file>src/gui/EmojiPicker.qml</file>
<file>src/gui/UserStatusSelectorButton.qml</file>
<file>src/gui/PredefinedStatusButton.qml</file>
<file>src/gui/BasicComboBox.qml</file>
<file>src/gui/ErrorBox.qml</file>
<file>src/gui/filedetails/FileActivityView.qml</file>
<file>src/gui/filedetails/FileDetailsPage.qml</file>
Expand Down
99 changes: 0 additions & 99 deletions src/gui/BasicComboBox.qml

This file was deleted.

2 changes: 1 addition & 1 deletion src/gui/UserStatusSelector.qml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ ColumnLayout {
wrapMode: Text.Wrap
}

BasicComboBox {
ComboBox {
id: clearComboBox

Layout.fillWidth: true
Expand Down

0 comments on commit 042568c

Please sign in to comment.