github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-08-23 18:21:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

attempt to fix Qt 6.4 build

Browse Source
This commit is contained in:
Jared Van Bortel 2024-10-21 18:25:31 -04:00
parent 834ea755f3
commit 830f698365
14 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gpt4all-chat/src/chat.cpp
View File

@ -14,10 +14,13 @@
#include <QStringList> #include <QStringList>
#include <QVariant> #include <QVariant>
#include <Qt> #include <Qt>
#include <QtLogging>
#include <utility> #include <utility>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
Chat::Chat(QObject *parent) Chat::Chat(QObject *parent)
: QObject(parent) : QObject(parent)
, m_id(Network::globalInstance()->generateUniqueId()) , m_id(Network::globalInstance()->generateUniqueId())

5
gpt4all-chat/src/chatapi.cpp
View File

@ -16,10 +16,13 @@
#include <QVariant> #include <QVariant>
#include <Qt> #include <Qt>
#include <QtGlobal> #include <QtGlobal>
#include <QtLogging>
#include <iostream> #include <iostream>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
using namespace Qt::Literals::StringLiterals; using namespace Qt::Literals::StringLiterals;
//#define DEBUG //#define DEBUG

5
gpt4all-chat/src/chatlistmodel.h
View File

@ -16,7 +16,10 @@
#include <QVector> #include <QVector>
#include <Qt> #include <Qt>
#include <QtGlobal> #include <QtGlobal>
#include <QtLogging>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
class ChatsRestoreThread : public QThread class ChatsRestoreThread : public QThread
{ {

5
gpt4all-chat/src/chatllm.cpp
View File

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

5
gpt4all-chat/src/database.cpp
View File

@ -24,13 +24,16 @@
#include <QUtf8StringView> #include <QUtf8StringView>
#include <QVariant> #include <QVariant>
#include <Qt> #include <Qt>
#include <QtLogging>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <optional> #include <optional>
#include <stdexcept> #include <stdexcept>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
using namespace Qt::Literals::StringLiterals; using namespace Qt::Literals::StringLiterals;
namespace ranges = std::ranges; namespace ranges = std::ranges;
namespace us = unum::usearch; namespace us = unum::usearch;

5
gpt4all-chat/src/download.cpp
View File

@ -27,13 +27,16 @@
#include <QVariant> #include <QVariant>
#include <QVector> #include <QVector>
#include <Qt> #include <Qt>
#include <QtLogging>
#include <algorithm> #include <algorithm>
#include <compare> #include <compare>
#include <cstddef> #include <cstddef>
#include <utility> #include <utility>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
using namespace Qt::Literals::StringLiterals; using namespace Qt::Literals::StringLiterals;
class MyDownload: public Download { }; class MyDownload: public Download { };

5
gpt4all-chat/src/embllm.cpp
View File

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

5
gpt4all-chat/src/llm.cpp
View File

@ -11,7 +11,10 @@
#include <QProcess> #include <QProcess>
#include <QSettings> #include <QSettings>
#include <QUrl> #include <QUrl>
#include <QtLogging>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
#ifdef GPT4ALL_OFFLINE_INSTALLER #ifdef GPT4ALL_OFFLINE_INSTALLER
# include <QDesktopServices> # include <QDesktopServices>

6
gpt4all-chat/src/logger.h
View File

@ -3,7 +3,11 @@
#include <QFile> #include <QFile>
#include <QString> #include <QString>
#include <QtLogging> #include <QtGlobal>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
class Logger class Logger
{ {

5
gpt4all-chat/src/modellist.cpp
View File

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

6
gpt4all-chat/src/mysettings.cpp
View File

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

5
gpt4all-chat/src/network.cpp
View File

@ -29,7 +29,6 @@
#include <QSysInfo> #include <QSysInfo>
#include <Qt> #include <Qt>
#include <QtGlobal> #include <QtGlobal>
#include <QtLogging>
#include <QUrl> #include <QUrl>
#include <QUuid> #include <QUuid>
@ -37,6 +36,10 @@
#include <cstring> #include <cstring>
#include <utility> #include <utility>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
#ifdef __GLIBC__ #ifdef __GLIBC__
# include <gnu/libc-version.h> # include <gnu/libc-version.h>
#endif #endif

4
gpt4all-chat/src/server.cpp
View File

@ -26,7 +26,6 @@
#include <Qt> #include <Qt>
#include <QtCborCommon> #include <QtCborCommon>
#include <QtGlobal> #include <QtGlobal>
#include <QtLogging>
#include <cstdint> #include <cstdint>
#include <iostream> #include <iostream>
@ -37,6 +36,9 @@
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
# include <QTcpServer> # include <QTcpServer>
#endif #endif

5
gpt4all-chat/src/xlsxtomd.cpp
View File

@ -16,10 +16,13 @@
#include <QStringView> #include <QStringView>
#include <QVariant> #include <QVariant>
#include <QtGlobal> #include <QtGlobal>
#include <QtLogging>
#include <memory> #include <memory>
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
# include <QtLogging>
#endif
using namespace Qt::Literals::StringLiterals; using namespace Qt::Literals::StringLiterals;