Port opensearch to QJSEngine to prepare for QT6

Author: AaronDewes

src/CMakeLists.txt

@@ -26,7 +26,7 @@ find_package(Qt5WebEngineWidgets REQUIRED)
 find_package(Qt5PrintSupport REQUIRED)
 find_package(Qt5UiTools)
 find_package(Qt5LinguistTools REQUIRED)
-find_package(Qt5Script REQUIRED)
+find_package(Qt5Qml REQUIRED)
 
 if(NOT Qt5UiTools_FOUND)
 	add_definitions(-DQT_NO_UITOOLS)
@@ -179,8 +179,8 @@ qt5_use_modules(endorphin WebEngine)
 qt5_use_modules(endorphin Network)
 qt5_use_modules(endorphin WebEngineWidgets)
 qt5_use_modules(endorphin PrintSupport)
+qt5_use_modules(endorphin Qml)
 
 if(Qt5UiTools_FOUND)
 	qt5_use_modules(endorphin UiTools)
 endif()
-qt5_use_modules(endorphin Script)

src/opensearch/opensearchengine.cpp

@@ -28,7 +28,7 @@
 #include <qnetworkreply.h>
 #include <qregexp.h>
 #include <qstringlist.h>
-#include <QScriptEngine>
+#include <QJSEngine>
 #include <QUrlQuery>
 
 /*!
@@ -543,19 +543,20 @@ void OpenSearchEngine::suggestionsObtained()
         return;
 
     if (!m_scriptEngine)
-        m_scriptEngine = new QScriptEngine();
+        m_scriptEngine = new QJSEngine();
 
     // Evaluate the JSON response using QtScript.
-    if (!m_scriptEngine->canEvaluate(response))
+    if (m_scriptEngine->evaluate(response).isError())
         return;
 
-    QScriptValue responseParts = m_scriptEngine->evaluate(response);
+    QJSValue responseParts = m_scriptEngine->evaluate(response);
 
     if (!responseParts.property(1).isArray())
         return;
 
     QStringList suggestionsList;
-    qScriptValueToSequence(responseParts.property(1), suggestionsList);
+
+    suggestionsList = responseParts.property(1).toVariant().toStringList();
 
     emit suggestions(suggestionsList);
 }

src/opensearch/opensearchengine.h

@@ -28,7 +28,7 @@
 #include <qurl.h>
 
 class QNetworkReply;
-class QScriptEngine;
+class QJSEngine;
 
 class OpenSearchEngineDelegate;
 class OpenSearchEngine : public QObject
@@ -135,7 +135,7 @@ private slots:
     QNetworkAccessManager *m_networkAccessManager;
     QNetworkReply *m_suggestionsReply;
 
-    QScriptEngine *m_scriptEngine;
+    QJSEngine *m_scriptEngine;
 
     OpenSearchEngineDelegate *m_delegate;
 };