1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr754'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-15 21:31:42 +01:00
commit 27f4963a22
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
7 changed files with 5 additions and 5 deletions

Binary file not shown.

BIN
img/icons/qtox_profile.icns Normal file

Binary file not shown.

View File

@ -34,7 +34,7 @@
<string>tox</string>
</array>
<key>CFBundleURLIconFile</key>
<string>qtox.icns</string>
<string>qtox_profile.icns</string>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
@ -49,10 +49,10 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleTypeIconFile</key>
<string>qtox.icns</string>
<string>qtox_profile.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>tox/x-profile</string>
<string>application/x-tox.profile</string>
</array>
<key>LSHandlerRank</key>
<string>Owner</string>

View File

@ -9,7 +9,7 @@ echo "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>
<title>qTox</title>
<license file=\"$PWD/gplv3.rtf\"/>
<welcome file=\"$PWD/welcome.txt\"/>
<domains enable_currentUserHome=\"true\" enable_localSystem=\"true\" enable_anywhere=\"true\"/>
<domains enable_currentUserHome=\"true\" enable_localSystem=\"false\" enable_anywhere=\"false\"/>
<options customize=\"never\" require-scripts=\"false\"/>
<choices-outline>
<line choice=\"default\">

View File

@ -69,7 +69,7 @@ win32 {
macx {
BUNDLEID = im.tox.qtox
ICON = img/icons/qtox.icns
QMAKE_INFO_PLIST = res/info.plist
QMAKE_INFO_PLIST = osx/info.plist
LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -framework OpenAL -lopencv_core -lopencv_highgui
} else {
# If we're building a package, static link libtox[core,av] and libsodium, since they are not provided by any package