aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp17
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";