mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-27 01:15:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in selmf/yacreader/compressed-archive-testing (pull request #24)

Browse Source 
wrapper improvements
This commit is contained in:
Luis Ángel San Martín
2015-05-04 15:07:52 +02:00
parent c84e432745 2432775755
commit a3935811ed
9 changed files with 153 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -285,10 +285,6 @@ exists (../compressed_archive/libp7zip) {
Please check the compressed_archive folder for further instructions.)
}
}
} else {
exists (../compressed_archive/unarr/unarr-master) {
message(Found unarr source code)
}
}
unix:!macx {

6
YACReaderLibrary/library_creator.cpp
View File

@ -122,8 +122,8 @@ void LibraryCreator::processLibrary(const QString & source, const QString & targ
void LibraryCreator::run()
{
stopRunning = false;
//check for 7z lib
#ifndef use_unarr
//check for 7z lib
#if defined Q_OS_UNIX && !defined Q_OS_MAC
QLibrary *sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so");
#else
@ -137,7 +137,7 @@ void LibraryCreator::run()
exit();
}
sevenzLib->deleteLater();
#endif
if(_mode == CREATOR)
{
QLOG_INFO() << "Starting to create new library ( " << _source << "," << _target << ")";

4
YACReaderLibrary/main.cpp
View File

@ -92,6 +92,7 @@ void logSystemAndConfig()
QLOG_INFO() << "SO : Unknown";
#endif
#ifndef use_unarr
#ifdef Q_OS_WIN
if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.dll"))
#elif defined Q_OS_UNIX && !defined Q_OS_MAC
@ -102,6 +103,9 @@ void logSystemAndConfig()
QLOG_INFO() << "7z : found";
else
QLOG_ERROR() << "7z : not found";
#else
QLOG_INFO() << "using unarr decompression backend";
#endif
#if defined Q_OS_UNIX && !defined Q_OS_MAC
if(QFileInfo(QString(BINDIR)+"/qrencode").exists())
#else