Browse Source

Merge branch 'ide_m2' of https://github.com/yann300/cpp-ethereum into yann300-ide_m2

cl-refactor
Gav Wood 10 years ago
parent
commit
10f908f5d6
  1. 1
      mix/AppContext.h
  2. 6
      mix/main.cpp

1
mix/AppContext.h

@ -59,6 +59,7 @@ private:
public slots:
void quitApplication() { delete Instance; }
void resourceLoaded(QObject* _obj, QUrl _url) { Q_UNUSED(_obj); Q_UNUSED(_url); initKeyEventManager(); }
};
}

6
mix/main.cpp

@ -35,9 +35,7 @@ int main(int _argc, char *_argv[])
QQmlApplicationEngine* engine = new QQmlApplicationEngine();
AppContext::setApplicationContext(engine);
QObject::connect(&app, SIGNAL(lastWindowClosed()), AppContext::getInstance(), SLOT(quitApplication())); //use to kill ApplicationContext and other stuff
engine->load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
AppContext::getInstance()->initKeyEventManager(); //has to be called after the loading of the main view.
QObject::connect(engine, SIGNAL(objectCreated(QObject*, QUrl)), AppContext::getInstance(), SLOT(resourceLoaded(QObject*, QUrl)));
engine->load(QUrl("qrc:/qml/main.qml"));
return app.exec();
}

Loading…
Cancel
Save