From 5f4de04f5b44e82aab537a53eec1bb725f4674aa Mon Sep 17 00:00:00 2001
From: Mikko Ahlroth <mikko.ahlroth@vincit.fi>
Date: Wed, 5 Nov 2014 21:40:52 +0200
Subject: [PATCH] Rewrite main function to set app details correctly. Thanks
 coderus!

Still doesn't start from the app grid though.
---
 harbour-weechatrelay.desktop |  1 -
 src/harbour-weechatrelay.cpp | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/harbour-weechatrelay.desktop b/harbour-weechatrelay.desktop
index 896241f..41b7a0f 100644
--- a/harbour-weechatrelay.desktop
+++ b/harbour-weechatrelay.desktop
@@ -4,4 +4,3 @@ X-Nemo-Application-Type=silica-qt5
 Name=WeeCRApp
 Icon=harbour-weechatrelay
 Exec=harbour-weechatrelay
-
diff --git a/src/harbour-weechatrelay.cpp b/src/harbour-weechatrelay.cpp
index 91a1094..48ad5ac 100644
--- a/src/harbour-weechatrelay.cpp
+++ b/src/harbour-weechatrelay.cpp
@@ -9,9 +9,10 @@
 #endif
 
 #include <sailfishapp.h>
-#include <QCoreApplication>
+#include <QScopedPointer>
 #include <QGuiApplication>
 #include <QtQml>
+#include <QQuickView>
 
 #include "connectionhandler.h"
 #include "qsslcertificateinfo.h"
@@ -27,14 +28,20 @@ int main(int argc, char* argv[])
     //
     // To display the view, call "show()" (will show fullscreen on device).
 
-    QCoreApplication::setApplicationName("WeeCRApp");
-    QCoreApplication::setOrganizationName("Nytsoi Inc.");
-    QCoreApplication::setOrganizationDomain("nytsoi.net");
+    QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
 
+    app->setApplicationName("WeeCRApp");
+    app->setOrganizationName("Nytsoi Inc.");
+    app->setOrganizationDomain("nytsoi.net");
+
+    QScopedPointer<QQuickView> view(SailfishApp::createView());
 
     // Register custom types to be accessible from QML
     qmlRegisterType<ConnectionHandler>("harbour.weechatrelay.connectionhandler", 1, 0, "ConnectionHandler");
     qmlRegisterType<QSslCertificateInfo>("harbour.weechatrelay.qsslcertificateinfo", 1, 0, "QSslCertificateInfo");
 
-    return SailfishApp::main(argc, argv);
+    view->setSource(SailfishApp::pathTo("qml/harbour-weechatrelay.qml"));
+    view->show();
+
+    return app->exec();
 }