Skip to content
This repository has been archived by the owner on May 10, 2018. It is now read-only.

Mac fixes #1888

Merged
merged 3 commits into from
Mar 19, 2016
Merged

Mac fixes #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
878cb8b
fixed compilation with openssl from homebrew
trnkava1 Mar 19, 2016
89d565d
Mac: Fixed opening Main Menu from button
trnkava1 Mar 19, 2016
a741729
Deleted unused MacMenuReceiver
trnkava1 Mar 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/app/browserwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ void BrowserWindow::setupMenu()
}

m_mainMenu = macMainMenu;
m_mainMenu->initSuperMenu(m_superMenu);
#else
setMenuBar(new MenuBar(this));

Expand Down
5 changes: 3 additions & 2 deletions src/lib/lib.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,9 @@ os2 {
}

mac {
HEADERS += other/macmenureceiver.h \
SOURCES += other/macmenureceiver.cpp \
# homebrew openssl
INCLUDEPATH += /opt/local/include
LIBS += -L/opt/local/lib

LIBS += -lcrypto -framework CoreServices
}
Expand Down