From 8dfd5b9455f2e1a3aa0d367944d98a2ace5a9ac2 Mon Sep 17 00:00:00 2001 From: Syping Date: Wed, 29 Jul 2020 11:07:29 +0200 Subject: [PATCH] add _LuaEngineMode --- src/luaengine/main.cpp | 2 +- src/luaengineapp/main.cpp | 3 ++- src/luaenginecli/main.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/luaengine/main.cpp b/src/luaengine/main.cpp index 0320f29..e785a9c 100644 --- a/src/luaengine/main.cpp +++ b/src/luaengine/main.cpp @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) LuaEngineNetwork::pushClass(&luaEngineGui); LuaEngineOS::pushClass(&luaEngineGui); luaEngineGui.pushVariant("_LuaEngineRT", rtPath); - luaEngineGui.setProperty("EngineMode", "GUI"); + luaEngineGui.pushVariant("_LuaEngineMode", "GUI"); luaEngineGui.setProperty("EngineType", "Runtime"); luaEngineGui.setProperty("ScriptPath", scriptPath); luaEngineGui.executeLuaScript(luaScript.readAll()); diff --git a/src/luaengineapp/main.cpp b/src/luaengineapp/main.cpp index 12cb84f..796a413 100644 --- a/src/luaengineapp/main.cpp +++ b/src/luaengineapp/main.cpp @@ -80,6 +80,7 @@ int main(int argc, char *argv[]) LuaEngineIO::pushClass(&luaEngineGui); LuaEngineNetwork::pushClass(&luaEngineGui); LuaEngineOS::pushClass(&luaEngineGui); + luaEngineGui.pushVariant("_LuaEngineMode", "GUI"); luaEngineGui.setProperty("EngineType", "Portable"); luaEngineGui.executeLuaScript(luaScript); @@ -94,7 +95,7 @@ int main(int argc, char *argv[]) return variant.toInt(); } else if (variant.type() == QVariant::String) { - if (variant.toString() == "GuiExecuted") { + if (variant.toString() == "GuiExecuted" || variant.toString() == "CliExecuted") { return a.exec(); } else { diff --git a/src/luaenginecli/main.cpp b/src/luaenginecli/main.cpp index aa39e31..b15c4ba 100644 --- a/src/luaenginecli/main.cpp +++ b/src/luaenginecli/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) LuaEngineNetwork::pushClass(&luaEngine); LuaEngineOS::pushClass(&luaEngine); luaEngine.pushVariant("_LuaEngineRT", rtPath); - luaEngine.setProperty("EngineMode", "CLI"); + luaEngine.pushVariant("_LuaEngineMode", "CLI"); luaEngine.setProperty("EngineType", "Runtime"); luaEngine.setProperty("ScriptPath", scriptPath); luaEngine.executeLuaScript(luaScript.readAll());