diff options
| author | Jonah Brüchert <jbb.prv@gmx.de> | 2019-11-12 22:37:10 +0100 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2019-11-18 14:08:53 -0600 |
| commit | 04e66fd5a89c8baf0536463635e6f9be68f93c39 (patch) | |
| tree | 6a16cf2d1ba4fcd006dea2b71d4aa74716b2b207 | |
| parent | 2e7df1768c37ef99a12644d33f58d650d14c5542 (diff) | |
| download | phonesim-04e66fd5a89c8baf0536463635e6f9be68f93c39.tar.gz | |
Replace QtScript with QtQml
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/control.cpp | 18 | ||||
| -rw-r--r-- | src/control.h | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 5cc4545..0587f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], fi ]) -PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Xml Qt5Network Qt5Script Qt5DBus Qt5Widgets, dummy=yes, +PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Xml Qt5Network Qt5Qml Qt5DBus Qt5Widgets, dummy=yes, AC_MSG_ERROR(Qt is required)) # Needed for qOverload diff --git a/src/control.cpp b/src/control.cpp index d4732b7..8c1e412 100644 --- a/src/control.cpp +++ b/src/control.cpp @@ -641,28 +641,28 @@ void ControlWidget::modemSilentReset() Script::Script(QObject *obj, Ui_ControlBase *ui) : QDBusAbstractAdaptor(obj) { /* Export tabs to be accessed by script */ - QScriptValue qsTab = engine.newQObject(ui->tab); + QJSValue qsTab = engine.newQObject(ui->tab); engine.globalObject().setProperty("tabRegistration", qsTab); - QScriptValue qsTab2 = engine.newQObject(ui->tab_2); + QJSValue qsTab2 = engine.newQObject(ui->tab_2); engine.globalObject().setProperty("tabCBM", qsTab2); - QScriptValue qsTab3 = engine.newQObject(ui->tab_3); + QJSValue qsTab3 = engine.newQObject(ui->tab_3); engine.globalObject().setProperty("tabSMS", qsTab3); - QScriptValue qsTab4 = engine.newQObject(ui->tab_4); + QJSValue qsTab4 = engine.newQObject(ui->tab_4); engine.globalObject().setProperty("tabVoiceMail", qsTab4); - QScriptValue qsTab5 = engine.newQObject(ui->tab_5); + QJSValue qsTab5 = engine.newQObject(ui->tab_5); engine.globalObject().setProperty("tabUSSD", qsTab5); - QScriptValue qsTab6 = engine.newQObject(ui->tab_6); + QJSValue qsTab6 = engine.newQObject(ui->tab_6); engine.globalObject().setProperty("tabSIM", qsTab6); - QScriptValue qsTab8 = engine.newQObject(ui->tab_8); + QJSValue qsTab8 = engine.newQObject(ui->tab_8); engine.globalObject().setProperty("tabPosition", qsTab8); - QScriptValue qsTab9 = engine.newQObject(ui->tab_9); + QJSValue qsTab9 = engine.newQObject(ui->tab_9); engine.globalObject().setProperty("tabCall", qsTab9); } @@ -705,7 +705,7 @@ QString Script::Run(const QString &name, const QDBusMessage &msg) QString contents = stream.readAll(); scriptFile.close(); - QScriptValue qsScript = engine.evaluate(contents); + QJSValue qsScript = engine.evaluate(contents); if (qsScript.isError()) { QString info = fileName + ", line " + qsScript.property("lineNumber").toString() + ", " + qsScript.toString(); QDBusMessage reply = msg.createErrorReply(SERVICE ".Error.ScriptExecError", info); diff --git a/src/control.h b/src/control.h index 6514bf4..a7c0ff3 100644 --- a/src/control.h +++ b/src/control.h @@ -22,7 +22,7 @@ #include <hardwaremanipulator.h> #include <QtDBus/QtDBus> -#include <QtScript> +#include <QJSEngine> #include "ui_controlbase.h" #include "attranslator.h" #include "callmanager.h" @@ -58,7 +58,7 @@ public slots: private: QString dirPath; - QScriptEngine engine; + QJSEngine engine; }; class ControlWidget : public QWidget |