diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2015-07-07 01:26:52 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2015-07-07 01:26:52 +0200 |
| commit | 7a4fcab8b071b1e55b5d510645d4c24f3fe382dc (patch) | |
| tree | cfd54af78ccb909cb940dce5dc98d3d528b0b795 | |
| parent | d37ed906a918f899f64f263de3675b74861ad0f8 (diff) | |
| parent | 9ad76a33a65ea9831decc5d2357456000223e560 (diff) | |
Merge branch 'master' into develop
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -71,12 +71,12 @@ Installation On most systems all you need is: `qmake && make && make install` -On MacOsX: +On Mac OS X: `qmake && make && macdeployqt QtPass.app` * Currently seems to only work with MacGPG2 On some systems there are issues with qt4 and qt5 being installed at the same time. -An easy fix is regenerating the Makefile with: `make clean && rm Makefile && qmake -qt5` or if qmake is ambiguous: `qmake-qt5` +An easy fix is regenerating the Makefile with: `make clean && rm Makefile && qmake -qt5` or if qmake is ambiguous: `qmake-qt5`. On Debian (and derivatives such as Ubuntu), the `qt5-default` package will install the required build tools. Further reading --------------- |