From 0017194a399fe47943df9744c7b0ecc18cd9d66c Mon Sep 17 00:00:00 2001
From: "Denis V. Dedkov" <denis.v.dedkov@gmail.com>
Date: Sat, 29 Nov 2025 12:41:21 +0200
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B5=D0=B9=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BC=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B5=D0=BD=D1=8B=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt |  9 ++++++++-
 main.cpp       | 26 +++++++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 022ad36..55b5a3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,14 @@ else()
     qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
 endif()
 
-add_subdirectory(components)
+include(FetchContent)
+FetchContent_Declare(
+  components
+  GIT_REPOSITORY https://gogs.dended.ru/ded/components.git
+  GIT_TAG master
+)
+
+FetchContent_MakeAvailable(components)
 
 target_link_libraries(beerlog
   PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::WebSockets componentsplugin)
diff --git a/main.cpp b/main.cpp
index 6f77f7e..c7e7afe 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,19 +2,19 @@
 #include <QQmlApplicationEngine>
 
 #include <QLocale>
-#include <QTranslator>
 #include <QQmlContext>
+#include <QTranslator>
 
-#include "models/usersmodel.h"
 #include "models/restsmodel.h"
+#include "models/usersmodel.h"
 
-#include "viewmodels/usersviewmodel.h"
-#include "viewmodels/productsviewmodel.h"
+#include "viewmodels/benchmarkviewmodel.h"
 #include "viewmodels/ordersviewmodel.h"
-#include "viewmodels/storesviewmodel.h"
+#include "viewmodels/productsviewmodel.h"
 #include "viewmodels/restsviewmodel.h"
 #include "viewmodels/settingsviewmodel.h"
-#include "viewmodels/benchmarkviewmodel.h"
+#include "viewmodels/storesviewmodel.h"
+#include "viewmodels/usersviewmodel.h"
 
 #include "services/beerservice.h"
 #include "services/modelsregister.h"
@@ -38,11 +38,15 @@ int main(int argc, char *argv[])
 
     QQmlApplicationEngine engine;
     const QUrl url(QStringLiteral("qrc:/main.qml"));
-    QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
-                     &app, [url](QObject *obj, const QUrl &objUrl) {
-        if (!obj && url == objUrl)
-            QCoreApplication::exit(-1);
-    }, Qt::QueuedConnection);
+    QObject::connect(
+        &engine,
+        &QQmlApplicationEngine::objectCreated,
+        &app,
+        [url](QObject *obj, const QUrl &objUrl) {
+            if (!obj && url == objUrl)
+                QCoreApplication::exit(-1);
+        },
+        Qt::QueuedConnection);
 
     engine.addImportPath("qrc:/");