feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Replace QScriptEngine with QJSEngine

Browse Source 
Change-Id: Iccc14c2197a30a7e62b2d388d163d1f89a5d1e87
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2015-04-28 17:06:29 +02:00
parent ad5c0261e5
commit b7964e6c97
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/customwizard/customwizardpreprocessor.cpp
View File

@@ -40,9 +40,7 @@
#include <QStack>
#include <QRegExp>
#include <QDebug>
#include <QScriptEngine>
#include <QScriptValue>
#include <QJSEngine>
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
bool evaluateBooleanJavaScriptExpression(QScriptEngine &engine, const QString &expression, bool *result, QString *errorMessage)
// Evaluate an expression within an 'if'/'elsif' to a bool via QJSEngine
bool evaluateBooleanJavaScriptExpression(QJSEngine &engine, const QString &expression, bool *result, QString *errorMessage)
{
errorMessage->clear();
*result = false;
engine.clearExceptions();
const QScriptValue value = engine.evaluate(expression);
if (engine.hasUncaughtException()) {
const QJSValue value = engine.evaluate(expression);
if (value.isError()) {
*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.