attempt to fix Qt 6.4 build

nomic-ai · Oct 21, 2024 · b42b22f · b42b22f
1 parent 7ed66a6
commit b42b22f
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 14 deletions.
diff --git a/gpt4all-chat/src/chat.cpp b/gpt4all-chat/src/chat.cpp
@@ -14,10 +14,13 @@
 #include <QStringList>
 #include <QVariant>
 #include <Qt>
-#include <QtLogging>
 
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 Chat::Chat(QObject *parent)
     : QObject(parent)
     , m_id(Network::globalInstance()->generateUniqueId())

diff --git a/gpt4all-chat/src/chatapi.cpp b/gpt4all-chat/src/chatapi.cpp
@@ -16,10 +16,13 @@
 #include <QVariant>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <iostream>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 //#define DEBUG

diff --git a/gpt4all-chat/src/chatlistmodel.h b/gpt4all-chat/src/chatlistmodel.h
@@ -16,7 +16,10 @@
 #include <QVector>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
 
 class ChatsRestoreThread : public QThread
 {

diff --git a/gpt4all-chat/src/chatllm.cpp b/gpt4all-chat/src/chatllm.cpp
@@ -24,7 +24,6 @@
 #include <QUrl>
 #include <QWaitCondition>
 #include <Qt>
-#include <QtLogging>
 
 #include <algorithm>
 #include <cctype>
@@ -37,6 +36,10 @@
 #include <utility>
 #include <vector>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 //#define DEBUG

diff --git a/gpt4all-chat/src/database.cpp b/gpt4all-chat/src/database.cpp
@@ -24,13 +24,16 @@
 #include <QUtf8StringView>
 #include <QVariant>
 #include <Qt>
-#include <QtLogging>
 
 #include <algorithm>
 #include <cmath>
 #include <optional>
 #include <stdexcept>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 namespace ranges = std::ranges;
 namespace us = unum::usearch;

diff --git a/gpt4all-chat/src/download.cpp b/gpt4all-chat/src/download.cpp
@@ -27,13 +27,16 @@
 #include <QVariant>
 #include <QVector>
 #include <Qt>
-#include <QtLogging>
 
 #include <algorithm>
 #include <compare>
 #include <cstddef>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 class MyDownload: public Download { };

diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp
@@ -22,12 +22,15 @@
 #include <QUrl>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <exception>
 #include <utility>
 #include <vector>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 static const QString EMBEDDING_MODEL_NAME = u"nomic-embed-text-v1.5"_s;

diff --git a/gpt4all-chat/src/llm.cpp b/gpt4all-chat/src/llm.cpp
@@ -11,7 +11,10 @@
 #include <QProcess>
 #include <QSettings>
 #include <QUrl>
-#include <QtLogging>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
 
 #ifdef GPT4ALL_OFFLINE_INSTALLER
 #   include <QDesktopServices>

diff --git a/gpt4all-chat/src/logger.h b/gpt4all-chat/src/logger.h
@@ -3,7 +3,11 @@
 
 #include <QFile>
 #include <QString>
-#include <QtLogging>
+#include <QtGlobal>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
 
 class Logger
 {

diff --git a/gpt4all-chat/src/modellist.cpp b/gpt4all-chat/src/modellist.cpp
@@ -32,7 +32,6 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QUrl>
-#include <QtLogging>
 
 #include <algorithm>
 #include <cstddef>
@@ -41,6 +40,10 @@
 #include <string>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 //#define USE_LOCAL_MODELSJSON

diff --git a/gpt4all-chat/src/mysettings.cpp b/gpt4all-chat/src/mysettings.cpp
@@ -15,13 +15,17 @@
 #include <QThread>
 #include <QUrl>
 #include <QVariant>
-#include <QtLogging>
+#include <QtGlobal>
 
 #include <algorithm>
 #include <string>
 #include <thread>
 #include <vector>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 // used only for settings serialization, do not translate

diff --git a/gpt4all-chat/src/network.cpp b/gpt4all-chat/src/network.cpp
@@ -29,14 +29,17 @@
 #include <QSysInfo>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
 #include <QUrl>
 #include <QUuid>
 
 #include <cmath>
 #include <cstring>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 #ifdef __GLIBC__
 #   include <gnu/libc-version.h>
 #endif

diff --git a/gpt4all-chat/src/server.cpp b/gpt4all-chat/src/server.cpp
@@ -26,7 +26,6 @@
 #include <Qt>
 #include <QtCborCommon>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <cstdint>
 #include <iostream>
@@ -37,6 +36,10 @@
 #include <unordered_map>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace std::string_literals;
 using namespace Qt::Literals::StringLiterals;
 

diff --git a/gpt4all-chat/src/xlsxtomd.cpp b/gpt4all-chat/src/xlsxtomd.cpp
@@ -16,10 +16,13 @@
 #include <QStringView>
 #include <QVariant>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <memory>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;