From 3a009baf606a6720122b64efc9fc3e18ba6e084c 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: Sun, 8 Sep 2019 15:34:39 +0800 Subject: Renamed the C++ to QML import --- main.cxx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'main.cxx') diff --git a/main.cxx b/main.cxx index 479d302..c9e8691 100644 --- a/main.cxx +++ b/main.cxx @@ -2,24 +2,28 @@ #include #include #include "user.hxx" -#include "controller.hxx" #include "tasklist.hxx" +#include "controller.hxx" int main(int argc, char* argv[]) { QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - User::typeId = qmlRegisterSingletonType("id.co.darapsa.kelakon.user" - , 0, 1, "User" - , [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* { + + User::typeId = qmlRegisterSingletonType("KelakonUser", 0, 1, "User" + , [](QQmlEngine *engine, + QJSEngine *scriptEngine) -> QObject* { Q_UNUSED(engine) Q_UNUSED(scriptEngine) return new User{}; }); - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - Controller controller{&engine}; + TaskList taskList; engine.rootContext()->setContextProperty("taskList", &taskList); + + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + Controller controller{&engine}; + return app.exec(); } -- cgit v1.2.3