From 5f35fdcaefedd28614ee8f97616bd43c7fbef54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Tue, 18 Jul 2023 15:07:17 +0200 Subject: [PATCH] Load 7z.so from LIBDIR in non macos unix systems --- compressed_archive/compressed_archive.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp index 6ec58bb2..1eb4a07f 100644 --- a/compressed_archive/compressed_archive.cpp +++ b/compressed_archive/compressed_archive.cpp @@ -175,7 +175,16 @@ bool CompressedArchive::loadFunctions() { // LOAD library if (sevenzLib == 0) { +#if defined Q_OS_UNIX && !defined Q_OS_MACOS + QFileInfo sevenzlibrary(QString(LIBDIR) + "/yacreader/7z.so"); + if (sevenzlibrary.exists()) { + sevenzLib = new QLibrary(sevenzlibrary.absoluteFilePath()); + } else { + sevenzLib = new QLibrary(QString(LIBDIR) + "/7zip/7z.so"); + } +#else sevenzLib = new QLibrary(QCoreApplication::applicationDirPath() + "/utils/7z"); +#endif } if (!sevenzLib->load()) { qDebug() << "Error Loading 7z.dll : " + sevenzLib->errorString() << Qt::endl;