fixed osx build for 8.5.0

This commit is contained in:
Luis Ángel San Martín
2016-02-18 18:23:41 +01:00
parent 08975089a4
commit 66266bc326
5 changed files with 26 additions and 21 deletions

View File

@ -12,7 +12,7 @@ INCLUDEPATH += ../common \
./db
DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY QT_NO_DEBUG_OUTPUT
QMAKE_MAC_SDK = macosx10.11
#load default build flags
#do a basic dependency check
include(headless_config.pri)

View File

@ -83,7 +83,7 @@ void logSystemAndConfig()
#elif defined Q_OS_UNIX && !defined Q_OS_MAC
if(QLibrary::isLibrary(QString(LIBDIR)+"/yacreader/7z.so") | QLibrary::isLibrary(QString(LIBDIR)+"/p7zip/7z.so"))
#else
if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.so"))
if(QLibrary::isLibrary(QCoreApplication::applicationDirPath()+"/utils/7z.so"))
#endif
QLOG_INFO() << "7z : found";
else