ProjectExplorer: Replace QScriptEngine with QJSEngine

Change-Id: Iccc14c2197a30a7e62b2d388d163d1f89a5d1e87
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

src/plugins/projectexplorer/customwizard/customwizardparameters.cpp

@@ -45,7 +45,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QIcon>
-#include <QScriptEngine>
+#include <QJSEngine>
 #include <QTemporaryFile>
 #include <QTime>
 #include <QXmlStreamAttribute>
@@ -177,7 +177,7 @@ bool CustomWizardValidationRule::validateRules(const QList<CustomWizardValidatio
     errorMessage->clear();
     if (rules.isEmpty())
         return true;
-    QScriptEngine engine;
+    QJSEngine engine;
     foreach (const CustomWizardValidationRule &rule, rules)
     if (!rule.validate(engine, replacementMap)) {
         *errorMessage = rule.message;
@@ -187,7 +187,7 @@ bool CustomWizardValidationRule::validateRules(const QList<CustomWizardValidatio
     return true;
 }
 
-bool CustomWizardValidationRule::validate(QScriptEngine &engine, const QMap<QString, QString> &replacementMap) const
+bool CustomWizardValidationRule::validate(QJSEngine &engine, const QMap<QString, QString> &replacementMap) const
 {
     // Apply parameters and evaluate using JavaScript
     QString cond = condition;

src/plugins/projectexplorer/customwizard/customwizardparameters.h

@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 class QIODevice;
 class QDebug;
 class QTemporaryFile;
-class QScriptEngine;
+class QJSEngine;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
@@ -82,7 +82,7 @@ public:
     static bool validateRules(const QList<CustomWizardValidationRule> &rules,
                               const QMap<QString, QString> &replacementMap,
                               QString *errorMessage);
-    bool validate(QScriptEngine &, const QMap<QString, QString> &replacementMap) const;
+    bool validate(QJSEngine &, const QMap<QString, QString> &replacementMap) const;
     QString condition;
     QString message;
 };

src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp

@@ -40,9 +40,7 @@
 #include <QStack>
 #include <QRegExp>
 #include <QDebug>
-
+#include <QJSEngine>
-#include <QScriptEngine>
-#include <QScriptValue>
 
 namespace ProjectExplorer {
 namespace Internal {
@@ -94,7 +92,7 @@ private:
     mutable QRegExp m_endifPattern;
 
     QStack<PreprocessStackEntry> m_sectionStack;
-    QScriptEngine m_scriptEngine;
+    QJSEngine m_scriptEngine;
 };
 
 PreprocessContext::PreprocessContext() :
@@ -137,16 +135,15 @@ PreprocessorSection PreprocessContext::preprocessorLine(const QString &in,
     return OtherSection;
 }
 
-// Evaluate an expression within an 'if'/'elsif' to a bool via QScript
+// Evaluate an expression within an 'if'/'elsif' to a bool via QJSEngine
-bool evaluateBooleanJavaScriptExpression(QScriptEngine &engine, const QString &expression, bool *result, QString *errorMessage)
+bool evaluateBooleanJavaScriptExpression(QJSEngine &engine, const QString &expression, bool *result, QString *errorMessage)
 {
     errorMessage->clear();
     *result = false;
-    engine.clearExceptions();
+    const QJSValue value = engine.evaluate(expression);
-    const QScriptValue value = engine.evaluate(expression);
+    if (value.isError()) {
-    if (engine.hasUncaughtException()) {
         *errorMessage = QString::fromLatin1("Error in \"%1\": %2").
-                        arg(expression, engine.uncaughtException().toString());
+                        arg(expression, value.toString());
         return false;
     }
     // Try to convert to bool, be that an int or whatever.

src/plugins/projectexplorer/customwizard/customwizardpreprocessor.h

@@ -33,14 +33,14 @@
 
 #include <QString>
 
-QT_FORWARD_DECLARE_CLASS(QScriptEngine)
+QT_FORWARD_DECLARE_CLASS(QJSEngine)
 
 namespace ProjectExplorer {
 namespace Internal {
 
 bool customWizardPreprocess(const QString &in, QString *out, QString *errorMessage);
 /* Helper to evaluate an expression. */
-bool evaluateBooleanJavaScriptExpression(QScriptEngine &engine, const QString &expression, bool *result, QString *errorMessage);
+bool evaluateBooleanJavaScriptExpression(QJSEngine &engine, const QString &expression, bool *result, QString *errorMessage);
 } // namespace Internal
 } // namespace ProjectExplorer
 

src/plugins/projectexplorer/projectexplorer.pro

@@ -1,4 +1,4 @@
-QT += quick script
+QT += quick qml
 
 include(../../qtcreatorplugin.pri)
 include(customwizard/customwizard.pri)

src/plugins/projectexplorer/projectexplorer.qbs

@@ -3,7 +3,7 @@ import qbs 1.0
 QtcPlugin {
     name: "ProjectExplorer"
 
-    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "qml"] }
     Depends { name: "Qt.quick" }
     Depends { name: "Aggregation" }
     Depends { name: "QtcSsh" }