diff --git a/BUILDING b/BUILDING.md similarity index 96% rename from BUILDING rename to BUILDING.md index 5c5a813b6..fc6544f0c 100644 --- a/BUILDING +++ b/BUILDING.md @@ -44,7 +44,9 @@ Linux / Unix MAC OS X ---------------------------------------------------------------------------------- - There is no extra dependency, you only need Qt tools and XCode. + You need to have Xcode from the Apple App Store installed in Applications, [Command Line Tools for the same Xcode version](https://developer.apple.com/), + [Homebrew](http://brew.sh/), and `$ brew install openssl` for openssl. + Next compulsory requirement is Qt 5 (>= 5.6) with QtWebEngine. After successful compilation, you need to run macdeploy.sh script to correctly build the application bundle. You will do it with following command: diff --git a/CHANGELOG b/CHANGELOG index 0fa301c87..161f2c4f5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -344,7 +344,7 @@ Version 1.4.0 * use .qupzilla/tmp instead of /tmp for temporary data * saving passwords should now work for much more sites * don't steal Ctrl+B/U/I shortcuts from page - * disabled by default opacity effect on tab previews - see BUILDING + * disabled by default opacity effect on tab previews - see BUILDING.md * improved showing navigation toolbar in fullscreen * moved config directory into ~/.config/qupzilla * certificates bundle is now only used on windows diff --git a/README.md b/README.md index 4fb1a539a..0c1ddcecd 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Compiling ---------------------------------------------------------------------------------------- Before you start compiling, make sure that you have installed the Qt (>= 5.6) development libraries -and you have read the [BUILDING](https://github.com/QupZilla/qupzilla/blob/master/BUILDING) information. +and you have read the [BUILDING.md](https://github.com/QupZilla/qupzilla/blob/master/BUILDING.md) information. **Linux** diff --git a/src/lib/lib.pro b/src/lib/lib.pro index ccaeda9d0..88cbcea80 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -480,8 +480,9 @@ os2 { mac { # homebrew openssl - INCLUDEPATH += /opt/local/include - LIBS += -L/opt/local/lib + BREW_OPENSSL = $$system("brew --prefix openssl") + INCLUDEPATH += $$BREW_OPENSSL/include + LIBS += -L$$BREW_OPENSSL/lib LIBS += -lcrypto -framework CoreServices }