merge

.gitignore

@@ -1,3 +1,17 @@
-cmake-build-debug/
-cmake-build-release/
-.idea/
+/**
+!/bin/**
+!/cmake/**
+!/etc/**
+!/include/**
+!/media/**
+!/resources/**
+!/sql/**
+!/src/**
+!/test/**
+!.gitignore
+!.CMakeLists.txt
+!COPYING
+!Doxyfile
+!README.md
+!todo_1.4.md
+!uid_fix_concept.md

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})

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="/">