mirror of
https://github.com/YACReader/yacreader
synced 2025-06-04 01:28:55 -04:00
fix merge
This commit is contained in:
parent
8c5f258f3e
commit
7f04e688f4
@ -199,7 +199,7 @@ bool CompressedArchive::loadFunctions()
|
|||||||
{
|
{
|
||||||
#if defined Q_OS_UNIX
|
#if defined Q_OS_UNIX
|
||||||
#if defined Q_OS_MAC
|
#if defined Q_OS_MAC
|
||||||
rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29");
|
rarLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/Codecs/Rar29");
|
||||||
#else
|
#else
|
||||||
//check if a yacreader specific version of p7zip exists on the system
|
//check if a yacreader specific version of p7zip exists on the system
|
||||||
QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so");
|
QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user