From f29b01744e7667bf16533dd2711114b6ce3215cc Mon Sep 17 00:00:00 2001
From: Debayan Sutradhar <debayansutradhar3@gmail.com>
Date: Sat, 25 Mar 2023 12:10:11 +0530
Subject: [PATCH] Bump version to 2.0, freeze qt material version to 2.15 to
 stay in MD1 for qt 6.5, refactor docs (#21)

* bump versions

* bump versions and freeze qt material version
---
 CMakeLists.txt                                                | 2 --
 README.md                                                     | 2 +-
 installer/config/config.xml                                   | 2 +-
 .../packages/io.github.rnayabed.rangoli/meta/package.xml      | 4 ++--
 src/KeyboardConfigurator.qml                                  | 4 ++--
 src/KeyboardMenuButton.qml                                    | 4 ++--
 src/Main.qml                                                  | 4 ++--
 src/Settings.qml                                              | 4 ++--
 src/messagehandler.cpp                                        | 3 ---
 9 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 543597b..da80623 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,6 @@ set(MACOSX_BUNDLE_COPYRIGHT "Debayan Sutradhar")
 set(MACOSX_BUNDLE_GUI_IDENTIFIER io.github.rnayabed.rangoli)
 
 add_compile_definitions(
-    DISABLE_QDEBUG=false
-
     VERSION=${VERSION}
     GIT_REPOSITORY="https://github.com/rnayabed/rangoli"
     SUPPORTED_KEYBOARDS="https://github.com/rnayabed/rangoli/blob/master/supported-keyboards.md"
diff --git a/README.md b/README.md
index a593e9f..de2b76a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 *Free, Open Source, Lightweight, Cross-platform Software for Royal Kludge Keyboards*
 
-![version](https://img.shields.io/badge/Version-1.0-green)
+![version](https://img.shields.io/badge/Version-2.0-green)
 ![Total Downloads](https://img.shields.io/github/downloads/rnayabed/rangoli/total?label=Total%20Downloads)
 [![Tip Me via PayPal](https://img.shields.io/badge/PayPal-Tip%20me-blue.svg?logo=paypal)](https://www.paypal.me/rnayabed)
 [![Tip Me via Ko-Fi](https://img.shields.io/badge/Ko--Fi-Tip%20me-red.svg?logo=kofi)](https://ko-fi.com/rnayabed)
diff --git a/installer/config/config.xml b/installer/config/config.xml
index 703e84d..04ba126 100644
--- a/installer/config/config.xml
+++ b/installer/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Rangoli</Name>
-    <Version>1.0</Version>
+    <Version>2.0</Version>
     <Title>Rangoli Installer</Title>
     <Publisher>Debayan Sutradhar</Publisher>
     <StartMenuDir>Rangoli</StartMenuDir>
diff --git a/installer/packages/io.github.rnayabed.rangoli/meta/package.xml b/installer/packages/io.github.rnayabed.rangoli/meta/package.xml
index 98a3504..16b8f04 100644
--- a/installer/packages/io.github.rnayabed.rangoli/meta/package.xml
+++ b/installer/packages/io.github.rnayabed.rangoli/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>Rangoli</DisplayName>
     <Description>Install Rangoli on your system</Description>
-    <Version>1.0</Version>
-    <ReleaseDate>2023-02-11</ReleaseDate>
+    <Version>2.0</Version>
+    <ReleaseDate>2023-03-25</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License Version 3.0" file="license.txt" />
     </Licenses>
diff --git a/src/KeyboardConfigurator.qml b/src/KeyboardConfigurator.qml
index 802be83..a91a121 100644
--- a/src/KeyboardConfigurator.qml
+++ b/src/KeyboardConfigurator.qml
@@ -15,8 +15,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Dialogs
 import QtQuick.Layouts // QTBUG-111187
-import QtQuick.Controls.Material
-import QtQuick.Controls.Material.impl
+import QtQuick.Controls.Material 2.15
+import QtQuick.Controls.Material.impl 2.15
 
 import Rangoli
 
diff --git a/src/KeyboardMenuButton.qml b/src/KeyboardMenuButton.qml
index e6cf59b..97d38af 100644
--- a/src/KeyboardMenuButton.qml
+++ b/src/KeyboardMenuButton.qml
@@ -13,8 +13,8 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Material
-import QtQuick.Controls.Material.impl
+import QtQuick.Controls.Material 2.15
+import QtQuick.Controls.Material.impl 2.15
 
 Item {
     property alias kbName: kbName.text
diff --git a/src/Main.qml b/src/Main.qml
index 41c60e6..d01a342 100644
--- a/src/Main.qml
+++ b/src/Main.qml
@@ -13,8 +13,8 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Material
-import QtQuick.Controls.Material.impl
+import QtQuick.Controls.Material 2.15
+import QtQuick.Controls.Material.impl 2.15
 import Qt.labs.platform
 import QtQml.Models
 
diff --git a/src/Settings.qml b/src/Settings.qml
index 4dcce40..efbe11e 100644
--- a/src/Settings.qml
+++ b/src/Settings.qml
@@ -13,8 +13,8 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Material
-import QtQuick.Controls.Material.impl
+import QtQuick.Controls.Material 2.15
+import QtQuick.Controls.Material.impl 2.15
 import QtQuick.Dialogs
 
 import Rangoli
diff --git a/src/messagehandler.cpp b/src/messagehandler.cpp
index fd3232d..00006b0 100644
--- a/src/messagehandler.cpp
+++ b/src/messagehandler.cpp
@@ -34,9 +34,6 @@ void MessageHandler::handler(QtMsgType messageType, const QMessageLogContext &co
 {
     Q_UNUSED(context)
 
-    if (messageType == QtDebugMsg && DISABLE_QDEBUG)
-        return;
-
     m_logStream << QDateTime::currentDateTime().toString(u"[dd/MM/yyyy] [hh:mm:ss] "_s);
 
     switch (messageType)