Merge pull request #22 from QuasarApp/ci

Addeed support ci targets

.gitignore

@@ -59,3 +59,4 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 *_autogen
+docs/html

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "CMake"]
 	path = CMake
 	url = https://github.com/QuasarApp/CMake.git
+[submodule "DoxyStyle"]
+	path = DoxyStyle
+	url = https://github.com/QuasarApp/DoxyStyle.git

CMakeLists.txt

@@ -26,7 +26,7 @@ cmake_minimum_required(VERSION 3.1)
 include(CMake/ProjectOut.cmake)
 include(CMake/ccache.cmake)
 include(CMake/Version.cmake)
-
+include(CMake/QuasarAppCITargets.cmake)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
@@ -46,3 +46,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core)
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 setVersion(1 4 4)
+
+initAll()
+addDoc(${PROJECT_NAME}Docs ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)

DoxyStyle

@@ -0,0 +1 @@
+Subproject commit b3d27bf1bac532d6a2284cbcc9fb5134778c6440

QuasarApp.pro

@@ -62,3 +62,7 @@ include(Etalons/qmake/ccache.pri)
 
 VERSION = 1.4.4
 
+# Add empty target for CI system
+QMAKE_EXTRA_TARGETS += \
+    test \
+    deploy

locales.cpp

@@ -14,6 +14,7 @@
 #include <QLibraryInfo>
 #include <QDir>
 #include <QRegularExpression>
+#include <QLibraryInfo>
 #include "params.h"
 
 using namespace QuasarAppUtils;
@@ -53,8 +54,12 @@ bool Locales::init(const QLocale &locale, const QSet<QString> & location) {
 }
 
 bool Locales::initPrivate(const QLocale &locale, const QSet<QString> & locations) {
-    auto defaultTr = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
 
+#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
+    auto defaultTr = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+#else
+    auto defaultTr = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
+#endif
     _locations = locations;
     if (!_locations.contains(defaultTr)) {
         _locations += defaultTr;

locales.h

@@ -12,6 +12,7 @@
 #include "quasarapp_global.h"
 
 #include <QLocale>
+#include <QSet>
 #include <QString>
 
 class QCoreApplication;