mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-17 20:44:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace Q_OS_MAC with Q_OS_MACOS

Browse Source
This commit is contained in:
Luis Ángel San Martín
2023-06-04 20:55:11 +02:00
parent 072f73b986
commit 68ece533e1
27 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
YACReaderLibrary/main.cpp
View File

@ -21,7 +21,7 @@
#include "yacreader_libraries.h"
#include "exit_check.h"
#include "opengl_checker.h"
#ifdef Q_OS_MACOS
#ifdef Q_OS_MACOSOS
#include "trayhandler.h"
#endif
@ -44,7 +44,7 @@ void logSystemAndConfig()
#if !defined use_unarr && !defined use_libarchive
#ifdef Q_OS_WIN
if (QLibrary::isLibrary(QApplication::applicationDirPath() + "/utils/7z.dll"))
#elif defined Q_OS_UNIX && !defined Q_OS_MAC
#elif defined Q_OS_UNIX && !defined Q_OS_MACOS
if (QLibrary::isLibrary(QString(LIBDIR) + "/yacreader/7z.so") | QLibrary::isLibrary(QString(LIBDIR) + "/p7zip/7z.so"))
#else
if (QLibrary::isLibrary(QApplication::applicationDirPath() + "/utils/7z.so"))
@ -58,7 +58,7 @@ void logSystemAndConfig()
QLOG_INFO() << "using unarr decompression backend";
#endif // use_unarr
#if defined Q_OS_UNIX && !defined Q_OS_MAC
#if defined Q_OS_UNIX && !defined Q_OS_MACOS
if (QFileInfo(QString(BINDIR) + "/qrencode").exists())
#else
if (QFileInfo(QApplication::applicationDirPath() + "/utils/qrencode.exe").exists() || QFileInfo("./util/qrencode").exists())
@ -169,7 +169,7 @@ int main(int argc, char **argv)
logger.addDestination(std::move(fileDestination));
QTranslator translator;
#if defined Q_OS_UNIX && !defined Q_OS_MAC
#if defined Q_OS_UNIX && !defined Q_OS_MACOS
translator.load(QLocale(), "yacreaderlibrary", "_", QString(DATADIR) + "/yacreader/languages");
#else
translator.load(QLocale(), "yacreaderlibrary", "_", "languages");
@ -177,7 +177,7 @@ int main(int argc, char **argv)
app.installTranslator(&translator);
/*QTranslator viewerTranslator;
#if defined Q_OS_UNIX && !defined Q_OS_MAC
#if defined Q_OS_UNIX && !defined Q_OS_MACOS
viewerTranslator.load(QString(DATADIR) + "/yacreader/languages/yacreader_" + sufix);
#else
viewerTranslator.load(QCoreApplication::applicationDirPath() + "/languages/yacreader_" + sufix);
@ -268,7 +268,7 @@ int main(int argc, char **argv)
if (!settings->value(START_TO_TRAY, false).toBool() || !settings->value(CLOSE_TO_TRAY, false).toBool()) {
mw->show();
}
#ifdef Q_OS_MACOS
#ifdef Q_OS_MACOSOS
else {
OSXHideDockIcon();
}