diff --git a/doric-Qt/doric/demo/demo_bridge.cpp b/doric-Qt/doric/demo/demo_bridge.cpp index c1a40437..2ae30f49 100644 --- a/doric-Qt/doric/demo/demo_bridge.cpp +++ b/doric-Qt/doric/demo/demo_bridge.cpp @@ -13,7 +13,7 @@ void DemoBridge::navigate(QVariant route) { switch (route.toInt()) { case 0: - QString name = "Snake.js"; + QString name = "Snake.es5.js"; QString script = Utils::readAssetFile("/doric/bundles", name); Panel panel; diff --git a/doric-Qt/doric/engine/bridge_extension.h b/doric-Qt/doric/engine/bridge_extension.h index f131bad4..0a309c42 100644 --- a/doric-Qt/doric/engine/bridge_extension.h +++ b/doric-Qt/doric/engine/bridge_extension.h @@ -10,7 +10,7 @@ class BridgeExtension : public QObject public: explicit BridgeExtension(QObject *parent = nullptr); - void callNative(QString contextId, QString module, QString methodName, QString callbackId, QJSValue jsValue); + Q_INVOKABLE void callNative(QString contextId, QString module, QString methodName, QString callbackId, QJSValue jsValue); }; #endif // BRIDGEEXTENSION_H diff --git a/doric-Qt/doric/qml.qrc b/doric-Qt/doric/qml.qrc index 8888cbef..0859ba0e 100644 --- a/doric-Qt/doric/qml.qrc +++ b/doric-Qt/doric/qml.qrc @@ -6,9 +6,12 @@ ../../doric-js/bundle/doric-sandbox.js + ../../doric-js/bundle/doric-sandbox.es5.js ../../doric-js/bundle/doric-lib.js + ../../doric-js/bundle/doric-lib.es5.js ../../doric-demo/bundle/src/Snake.js + ../../doric-demo/bundle/src/Snake.es5.js diff --git a/doric-Qt/doric/utils/constant.cpp b/doric-Qt/doric/utils/constant.cpp index 2dd39c01..3269d623 100644 --- a/doric-Qt/doric/utils/constant.cpp +++ b/doric-Qt/doric/utils/constant.cpp @@ -1,7 +1,7 @@ #include "constant.h" -const QString Constant::DORIC_BUNDLE_SANDBOX = "doric-sandbox.js"; -const QString Constant::DORIC_BUNDLE_LIB = "doric-lib.js"; +const QString Constant::DORIC_BUNDLE_SANDBOX = "doric-sandbox.es5.js"; +const QString Constant::DORIC_BUNDLE_LIB = "doric-lib.es5.js"; const QString Constant::DORIC_MODULE_LIB = "doric"; const QString Constant::INJECT_ENVIRONMENT = "Environment";