Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS: add basic menubar support #2242

Merged
merged 1 commit into from
Apr 22, 2021
Merged

Conversation

selsta
Copy link
Collaborator

@selsta selsta commented Jul 1, 2019

menubar

@selsta selsta changed the title macOS: add basic menubar support [WIP] macOS: add basic menubar support Jul 1, 2019
@jonathancross
Copy link
Contributor

@selsta Needs a rebase.

@selsta
Copy link
Collaborator Author

selsta commented Jul 16, 2019

Rebased, but there’s still a bug that breaks Windows and Linux compilation :/

@selsta selsta force-pushed the menubar3 branch 2 times, most recently from 2992353 to 26e63ed Compare July 16, 2019 22:23
@selsta selsta changed the title [WIP] macOS: add basic menubar support [Waiting for Qt update] macOS: add basic menubar support Sep 18, 2019
@selsta
Copy link
Collaborator Author

selsta commented Sep 18, 2019

Due to a bug in Qt 5.9, this is broken on Windows and Linux. PR will have to stay open until we update to a newer Qt version.

@selsta selsta changed the title [Waiting for Qt update] macOS: add basic menubar support [Requires Qt update] macOS: add basic menubar support Sep 18, 2019
@selsta selsta force-pushed the menubar3 branch 2 times, most recently from f29ef3a to 8e78e84 Compare February 13, 2020 00:39
@selsta
Copy link
Collaborator Author

selsta commented Jun 15, 2020

This passes CI now, hmm... I wonder if we could merge this now.

@selsta selsta changed the title [Requires Qt update] macOS: add basic menubar support macOS: add basic menubar support Jun 15, 2020
@selsta
Copy link
Collaborator Author

selsta commented Jul 8, 2020

Still have to work on adding static linux cmake support to this PR.

@selsta
Copy link
Collaborator Author

selsta commented Aug 16, 2020

@selsta selsta force-pushed the menubar3 branch 2 times, most recently from e702039 to dfb42ba Compare April 18, 2021 05:20
@selsta
Copy link
Collaborator Author

selsta commented Apr 18, 2021

Fixed all issues now, ready for review.

// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import Qt.labs.platform 1.0 as PlatformLabs
import "../components" as MoneroComponents
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated (if that's what you meant)

@luigi1111 luigi1111 merged commit beb566f into monero-project:master Apr 22, 2021
@selsta selsta deleted the menubar3 branch May 6, 2021 01:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants