Fix compatibility with Qt 6.4

Signed-off-by: Xu Zhen <[email protected]>
sodeve · Mar 12, 2024 · 0072860 · 0072860
1 parent ef9717d
commit 0072860
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
@@ -40,9 +40,9 @@ configure_file(
 )
 
 if(LINUX)
-  find_package(Qt6 6.5 COMPONENTS Core Quick WaylandCompositor QuickDialogs2 Svg HttpServer Sql Pdf REQUIRED)
+  find_package(Qt6 6.4 COMPONENTS Core Quick WaylandCompositor QuickDialogs2 Svg HttpServer Sql Pdf REQUIRED)
 else()
-  find_package(Qt6 6.5 COMPONENTS Core Quick QuickDialogs2 Svg HttpServer Sql Pdf REQUIRED)
+  find_package(Qt6 6.4 COMPONENTS Core Quick QuickDialogs2 Svg HttpServer Sql Pdf REQUIRED)
 endif()
 
 # Get the Qt6Core target properties

diff --git a/gpt4all-chat/chatgpt.cpp b/gpt4all-chat/chatgpt.cpp
@@ -211,7 +211,7 @@ void ChatGPTWorker::handleFinished()
     int code = response.toInt(&ok);
     if (!ok || code != 200) {
         qWarning() << QString("ERROR: ChatGPT responded with error code \"%1-%2\"")
-            .arg(code).arg(reply->errorString()).toStdString();
+            .arg(code).arg(reply->errorString());
     }
     reply->deleteLater();
     emit finished();
@@ -280,6 +280,6 @@ void ChatGPTWorker::handleErrorOccurred(QNetworkReply::NetworkError code)
     }
 
     qWarning() << QString("ERROR: ChatGPT responded with error code \"%1-%2\"")
-                      .arg(code).arg(reply->errorString()).toStdString();
+                      .arg(code).arg(reply->errorString());
     emit finished();
 }
diff --git a/gpt4all-chat/chatllm.cpp b/gpt4all-chat/chatllm.cpp
@@ -964,7 +964,7 @@ void ChatLLM::saveState()
     if (m_llModelType == LLModelType::CHATGPT_) {
         m_state.clear();
         QDataStream stream(&m_state, QIODeviceBase::WriteOnly);
-        stream.setVersion(QDataStream::Qt_6_5);
+        stream.setVersion(QDataStream::Qt_6_4);
         ChatGPT *chatGPT = static_cast<ChatGPT*>(m_llModelInfo.model);
         stream << chatGPT->context();
         return;
@@ -985,7 +985,7 @@ void ChatLLM::restoreState()
 
     if (m_llModelType == LLModelType::CHATGPT_) {
         QDataStream stream(&m_state, QIODeviceBase::ReadOnly);
-        stream.setVersion(QDataStream::Qt_6_5);
+        stream.setVersion(QDataStream::Qt_6_4);
         ChatGPT *chatGPT = static_cast<ChatGPT*>(m_llModelInfo.model);
         QList<QString> context;
         stream >> context;

diff --git a/gpt4all-chat/modellist.cpp b/gpt4all-chat/modellist.cpp
@@ -1299,7 +1299,7 @@ void ModelList::handleModelsJsonDownloadErrorOccurred(QNetworkReply::NetworkErro
         return;
 
     qWarning() << QString("ERROR: Modellist download failed with error code \"%1-%2\"")
-                      .arg(code).arg(reply->errorString()).toStdString();
+                      .arg(code).arg(reply->errorString());
 }
 
 void ModelList::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)