Merge branch 'master' into develop

This commit is contained in:
Janek Bevendorff 2019-06-12 01:10:25 +02:00
commit 38524507d5
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
14 changed files with 1168 additions and 1248 deletions

View file

@ -44,6 +44,8 @@ if(WITH_XC_BROWSER)
"@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
-change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork
"@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
-change /usr/local/opt/libsodium/lib/libsodium.23.dylib
"@executable_path/../Frameworks/libsodium.23.dylib"
keepassxc-proxy
COMMENT "Changing linking of keepassxc-proxy")