From e24aa650fe629ff61d832d1c815ed74115d9659c Mon Sep 17 00:00:00 2001
From: p620 <p620@cr-ws-0>
Date: Sat, 10 Oct 2020 21:25:45 +0300
Subject: [PATCH 1/2] Update CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edd52f59..939df2be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ COLLECT_FILES(true headers_to_moc src/noggit ".h;.hpp")
 FOREACH(file IN LISTS headers_to_moc)
   SET(file_full ${file})
   STRING(PREPEND file_full ${PROJECT_SOURCE_DIR}/)
-  FILE(STRINGS ${file_full} contents REGEX "Q_OBJECT[\t ]*")
+  FILE(STRINGS ${file_full} contents NEWLINE_CONSUME REGEX "Q_OBJECT[\t ;]*\n")
 
   IF("${contents}" STREQUAL "")
     LIST(REMOVE_ITEM headers_to_moc ${file})

From db800e35410719a3145f7aecffe767f6be222201 Mon Sep 17 00:00:00 2001
From: p620 <p620@cr-ws-0>
Date: Sun, 11 Oct 2020 03:44:54 +0300
Subject: [PATCH 2/2] Implement .gitignore whitelist paradigm.

---
 .gitignore              | 20 +++++++++++++++++---
 resources/resources.qrc |  2 --
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab644ee7..c79bad04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
-cmake-build-debug/
-cmake-build-release/
-.idea/
\ No newline at end of file
+/**
+!/bin/**
+!/cmake/**
+!/etc/**
+!/include/**
+!/media/**
+!/resources/**
+!/sql/**
+!/src/**
+!/test/**
+!.gitignore
+!.CMakeLists.txt
+!COPYING
+!Doxyfile
+!README.md
+!todo_1.4.md
+!uid_fix_concept.md
diff --git a/resources/resources.qrc b/resources/resources.qrc
index 0689d9e8..a26b7d1b 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -2,8 +2,6 @@
 <RCC version="1.0">
     <qresource prefix="/fonts">
         <file>fa-solid-900.ttf</file>
-    </qresource>
-    <qresource prefix="/fonts">
         <file>noggit_font.ttf</file>
     </qresource>
     <qresource prefix="/">