diff options
author | Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> | 2021-06-29 15:21:09 +0200 |
---|---|---|
committer | Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> | 2021-06-29 15:21:09 +0200 |
commit | 76212577cb3fd60d41aab175270ede0b2dcdb038 (patch) | |
tree | 61265cac9d6a3f5cb25849337dced30942be645b /src/main.cpp | |
parent | 8f4d0f9d34b3676e6f64fd7b4effab582aabc006 (diff) | |
download | RWA.Support.DesktopApp-76212577cb3fd60d41aab175270ede0b2dcdb038.tar.gz RWA.Support.DesktopApp-76212577cb3fd60d41aab175270ede0b2dcdb038.tar.bz2 RWA.Support.DesktopApp-76212577cb3fd60d41aab175270ede0b2dcdb038.zip |
Add feature: Multiple Scenes; Relocate files
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index 381bc9c..2b1837a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,27 +61,26 @@ int main(int argc, char *argv[]) { QQmlApplicationEngine engine(&app); QScopedPointer<MainQMLAdaptor> main_gui (new MainQMLAdaptor(&app, &engine)); - //MainQMLAdaptor *main_gui = new MainQMLAdaptor(&app, &engine); + // Make mainqmladaptor available to QML engine.rootContext()->setContextProperty("mainqmladaptor", main_gui.data()); qDebug() << "'mainqmladaptor' is now available in QML context."; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + engine.load(QUrl(QStringLiteral("qrc:/src/main.qml"))); if (engine.rootObjects().isEmpty()) return -1; QScopedPointer<Session> session (new Session(&app, main_gui.data())); - //Session *session = new Session(&app, &engine, main_gui); QObject::connect(main_gui.data(), - SIGNAL(minimizeWindow()), - engine.rootObjects().takeFirst(), - SLOT(minimizeWindow())); + SIGNAL(minimizeWindow()), + engine.rootObjects().takeFirst(), + SLOT(minimizeWindow())); QObject::connect(main_gui.data(), - SIGNAL(showWindow()), - engine.rootObjects().takeFirst(), - SLOT(showWindow())); + SIGNAL(showWindow()), + engine.rootObjects().takeFirst(), + SLOT(showWindow())); // We don't want users to have multiple instances of this app running QString tmpDirPath = QDir::tempPath() + "/rwa.support.desktopapp"; |