Merge pull request #1888 from trnkava1/macFixes

Mac fixes
QupZilla · Mar 19, 2016 · 3f10e63 · 3f10e63
2 parents a16c21b + a741729
commit 3f10e63
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 666 deletions.
diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp
@@ -349,6 +349,7 @@ void BrowserWindow::setupMenu()
     }
 
     m_mainMenu = macMainMenu;
+    m_mainMenu->initSuperMenu(m_superMenu);
 #else
     setMenuBar(new MenuBar(this));
 

diff --git a/src/lib/lib.pro b/src/lib/lib.pro
@@ -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
 }