diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..abad47292df03305781df6f13c3abfdd13ffd172 Binary files /dev/null and b/.DS_Store differ diff --git a/applicationQT2048/Main.qml b/applicationQT2048/Main.qml index 3cec32b258b7e35ce6b1152ce015046decff4ede..8a5a673d239794321b8a5e27769311031d3ee704 100644 --- a/applicationQT2048/Main.qml +++ b/applicationQT2048/Main.qml @@ -7,6 +7,7 @@ Window { height: 500 title: qsTr("Application 2048") + Rectangle{ width:100;height:100 color:"orange" diff --git a/applicationQT2048/main.cpp b/applicationQT2048/main.cpp index 0063e0ea6ca50e107328f270aae6523b99a7d9cc..b1fb703e27c8568e53b3df27b8efeb7e5be1fa8e 100644 --- a/applicationQT2048/main.cpp +++ b/applicationQT2048/main.cpp @@ -1,9 +1,11 @@ #include <QGuiApplication> #include <QQmlApplicationEngine> - +#include <QQmlContext> +#include "gamemanager.h" int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); + GameManager gameManager; QQmlApplicationEngine engine; QObject::connect( @@ -12,7 +14,8 @@ int main(int argc, char *argv[]) &app, []() { QCoreApplication::exit(-1); }, Qt::QueuedConnection); + engine.rootContext()->setContextProperty("gameManager", &gameManager); engine.loadFromModule("applicationQT2048", "Main"); - return app.exec(); + }