45 lines
1.2 KiB
Plaintext
45 lines
1.2 KiB
Plaintext
From ecd51e6384186d39ceb01ebd6ccda25d89f0a5b5 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Sun, 2 Feb 2020 20:32:49 +1000
|
|
Subject: Fix build for Haiku
|
|
|
|
|
|
diff --git a/src/application/logfile.cpp b/src/application/logfile.cpp
|
|
index 4687da1..f84d087 100644
|
|
--- a/src/application/logfile.cpp
|
|
+++ b/src/application/logfile.cpp
|
|
@@ -34,7 +34,8 @@ LogFile::LogFile()
|
|
#ifdef HAVE_QT5
|
|
void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QString &msg)
|
|
{
|
|
- if (!globals.isInit_)
|
|
+}
|
|
+/* if (!globals.isInit_)
|
|
return;
|
|
if (msg.startsWith("libpng warning: iCCP"))
|
|
return;
|
|
@@ -82,6 +83,7 @@ void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QStri
|
|
file.close();
|
|
}
|
|
}
|
|
+*/
|
|
#else
|
|
void LogFile::msgHandler(QtMsgType type, const char *msg)
|
|
{
|
|
diff --git a/src/main/globals.cpp b/src/main/globals.cpp
|
|
index c3dd738..9f98cae 100644
|
|
--- a/src/main/globals.cpp
|
|
+++ b/src/main/globals.cpp
|
|
@@ -57,7 +57,7 @@ void Globals::init()
|
|
#endif
|
|
|
|
// Check Dir ...
|
|
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
|
|
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2) || defined(Q_OS_HAIKU)
|
|
resourcesDir_ = QCoreApplication::applicationDirPath();
|
|
#else
|
|
#if defined(Q_OS_MAC)
|
|
--
|
|
2.24.1
|
|
|