From 89bff3fa5d58aeb0d507d633aa058d781f06a8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Thu, 5 Sep 2019 21:21:52 +0800 Subject: Connected a more straightforward signal to login --- main.cxx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'main.cxx') diff --git a/main.cxx b/main.cxx index 222a8b1..db21e08 100644 --- a/main.cxx +++ b/main.cxx @@ -7,21 +7,20 @@ int main(int argc, char* argv[]) { QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); - QQmlApplicationEngine engine; + qmlRegisterSingletonType("id.co.darapsa.kelakon.user", 0, 1, "User", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* { Q_UNUSED(engine) Q_UNUSED(scriptEngine) return new User{}; }); - auto typeId = qmlRegisterSingletonType("id.co.darapsa.kelakon.rtclient", 0, 1, "RTClient", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* { - Q_UNUSED(engine) - Q_UNUSED(scriptEngine) - return new Controller{}; - }); - auto controller = engine.singletonInstance(typeId); - Q_UNUSED(controller) + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + auto rootObjects = engine.rootObjects(); + if (rootObjects.isEmpty()) return -1; + + auto appWindow = rootObjects[0]; + Controller controller{appWindow}; return app.exec(); } -- cgit v1.2.3