From d24908f7c876c950d1e115dcd25f9b46bc2ec94a Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 1 Apr 2021 13:04:01 +0300
Subject: [PATCH 1/6] update cmake
---
CMake | 2 +-
CMakeLists.txt | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/CMake b/CMake
index 30b2e07..1d440b9 160000
--- a/CMake
+++ b/CMake
@@ -1 +1 @@
-Subproject commit 30b2e07c474ab032dd120475b0a2a4cca6012fe7
+Subproject commit 1d440b95aa9fa67379199573ccf18c5c61cedb68
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 915d12f..15267bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ include(CMake/ProjectOut.cmake)
include(CMake/ccache.cmake)
include(CMake/Version.cmake)
include(CMake/QuasarAppCITargets.cmake)
+include(CMake/QtFunctions.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
@@ -34,10 +35,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if (NOT QT_VERSION_MAJOR)
- find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
- find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
-endif ()
+includeQt(Core)
file(GLOB SOURCE_CPP
"*.cpp"
From 7af6efb0c6cb976eb70e4fca1dfa0225ca24e7a8 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 1 Apr 2021 13:07:15 +0300
Subject: [PATCH 2/6] fix typo error
---
CMakeLists.txt | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15267bb..2fbb5d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,11 +27,9 @@ include(CMake/ProjectOut.cmake)
include(CMake/ccache.cmake)
include(CMake/Version.cmake)
include(CMake/QuasarAppCITargets.cmake)
-include(CMake/QtFunctions.cmake)
+include(CMake/QtUtils.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
From ca54815677be6f6a499b12a7c2070ee09d7dc948 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 1 Apr 2021 13:28:13 +0300
Subject: [PATCH 3/6] update cmake
---
CMake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMake b/CMake
index 1d440b9..0742f0f 160000
--- a/CMake
+++ b/CMake
@@ -1 +1 @@
-Subproject commit 1d440b95aa9fa67379199573ccf18c5c61cedb68
+Subproject commit 0742f0f870047692756e19d0b513d5f8e6bd72a1
From 37dc7a7c806a4ca071b26024db97ca4f59be62f9 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 1 Apr 2021 13:37:58 +0300
Subject: [PATCH 4/6] update cmake
---
CMake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMake b/CMake
index 0742f0f..0a7b287 160000
--- a/CMake
+++ b/CMake
@@ -1 +1 @@
-Subproject commit 0742f0f870047692756e19d0b513d5f8e6bd72a1
+Subproject commit 0a7b2876c7b64110d823da05f5f413c723a31471
From 1130c1d2a6673fd90f8db26f0b8d78915a90a3bd Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 1 Apr 2021 13:41:19 +0300
Subject: [PATCH 5/6] udapte log
---
CMake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMake b/CMake
index 0a7b287..47243ed 160000
--- a/CMake
+++ b/CMake
@@ -1 +1 @@
-Subproject commit 0a7b2876c7b64110d823da05f5f413c723a31471
+Subproject commit 47243ed442efbeba5f8a2305138b6cb72da763fa
From cf88bc82642180865e84a3dde45313ad21ab0d28 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 1 Apr 2021 13:48:24 +0300
Subject: [PATCH 6/6] move doxygen into cmake
---
.gitmodules | 3 ---
CMake | 2 +-
DoxyStyle | 1 -
doxygen.conf | 4 ++--
4 files changed, 3 insertions(+), 7 deletions(-)
delete mode 160000 DoxyStyle
diff --git a/.gitmodules b/.gitmodules
index bd4ed3f..d892894 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "CMake"]
path = CMake
url = https://github.com/QuasarApp/CMake.git
-[submodule "DoxyStyle"]
- path = DoxyStyle
- url = https://github.com/QuasarApp/DoxyStyle.git
diff --git a/CMake b/CMake
index 47243ed..c988ce2 160000
--- a/CMake
+++ b/CMake
@@ -1 +1 @@
-Subproject commit 47243ed442efbeba5f8a2305138b6cb72da763fa
+Subproject commit c988ce28e9132f9a9fe8cb9503c27d16d79d05d4
diff --git a/DoxyStyle b/DoxyStyle
deleted file mode 160000
index b3d27bf..0000000
--- a/DoxyStyle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3d27bf1bac532d6a2284cbcc9fb5134778c6440
diff --git a/doxygen.conf b/doxygen.conf
index 3507a1f..5faed0c 100644
--- a/doxygen.conf
+++ b/doxygen.conf
@@ -703,7 +703,7 @@ FILE_VERSION_FILTER =
# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
# tag is left empty.
-LAYOUT_FILE = DoxyStyle/DoxygenLayout.xml
+LAYOUT_FILE = CMake/DoxyStyle/DoxygenLayout.xml
# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
# the reference definitions. This must be a list of .bib files. The .bib
@@ -1193,7 +1193,7 @@ HTML_STYLESHEET =
# list). For an example see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_EXTRA_STYLESHEET = DoxyStyle/doxygenStyles.css
+HTML_EXTRA_STYLESHEET = CMake/DoxyStyle/doxygenStyles.css
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note