Bläddra i källkod

Задействованы компоненыт

Denis V. Dedkov 2 månader sedan
förälder
incheckning
0017194a39
2 ändrade filer med 23 tillägg och 12 borttagningar
  1. 8 1
      CMakeLists.txt
  2. 15 11
      main.cpp

+ 8 - 1
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)

+ 15 - 11
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:/");