From 551e370410118eb94768f002e12ca98039a4ee4a Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Mon, 1 Oct 2018 16:34:25 +0800
Subject: [PATCH] More clean up.

---
 imports/Spectral/Font/qmldir    |  3 +++
 imports/Spectral/Setting/qmldir |  3 +++
 res.qrc                         |  2 ++
 spectral.pro                    |  3 ---
 src/main.cpp                    | 11 -----------
 5 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100644 imports/Spectral/Font/qmldir
 create mode 100644 imports/Spectral/Setting/qmldir

diff --git a/imports/Spectral/Font/qmldir b/imports/Spectral/Font/qmldir
new file mode 100644
index 000000000..57fb41f65
--- /dev/null
+++ b/imports/Spectral/Font/qmldir
@@ -0,0 +1,3 @@
+module Spectral.Font
+singleton MaterialFont 0.1 MaterialFont.qml
+
diff --git a/imports/Spectral/Setting/qmldir b/imports/Spectral/Setting/qmldir
new file mode 100644
index 000000000..5e1c2a7d2
--- /dev/null
+++ b/imports/Spectral/Setting/qmldir
@@ -0,0 +1,3 @@
+module Spectral.Setting
+singleton MSettings 0.1 Setting.qml
+
diff --git a/res.qrc b/res.qrc
index 68416448c..560dcb002 100644
--- a/res.qrc
+++ b/res.qrc
@@ -39,5 +39,7 @@
         <file>assets/img/icon.png</file>
         <file>imports/Spectral/Setting/Setting.qml</file>
         <file>imports/Spectral/Font/MaterialFont.qml</file>
+        <file>imports/Spectral/Font/qmldir</file>
+        <file>imports/Spectral/Setting/qmldir</file>
     </qresource>
 </RCC>
diff --git a/spectral.pro b/spectral.pro
index 651143a55..0367427ab 100644
--- a/spectral.pro
+++ b/spectral.pro
@@ -3,9 +3,6 @@ CONFIG += c++14
 CONFIG += object_parallel_to_source
 CONFIG += link_pkgconfig
 
-# Enable this to use QtQuick Compiler.
-#CONFIG += qtquickcompiler
-
 TARGET = spectral
 
 isEmpty(USE_SYSTEM_SORTFILTERPROXYMODEL) {
diff --git a/src/main.cpp b/src/main.cpp
index 5a165cee8..189e186a1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -48,25 +48,14 @@ int main(int argc, char *argv[]) {
                                                "RoomMessageEvent", "ENUM");
   qmlRegisterUncreatableType<RoomType>("Spectral", 0, 1, "RoomType", "ENUM");
 
-  qmlRegisterSingletonType(QUrl("qrc:/imports/Spectral/Setting/Setting.qml"),
-                           "Spectral.Setting", 0, 1, "MSettings");
-  qmlRegisterSingletonType(
-      QUrl("qrc:/imports/Spectral/Font/MaterialFont.qml"), "Spectral.Font",
-      0, 1, "MaterialFont");
-  qmlRegisterModule("qrc:/qml/component", 2, 0);
-
   QQmlApplicationEngine engine;
 
   engine.addImportPath("qrc:/imports");
-
   ImageProvider *m_provider = new ImageProvider();
-
   engine.rootContext()->setContextProperty("imageProvider", m_provider);
-
   engine.addImageProvider(QLatin1String("mxc"), m_provider);
 
   engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
-
   if (engine.rootObjects().isEmpty()) return -1;
 
   return app.exec();