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

This commit is contained in:
2025-11-29 12:41:21 +02:00
parent f95c4e304d
commit 0017194a39
2 changed files with 23 additions and 12 deletions

View File

@@ -61,7 +61,14 @@ else()
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
endif() 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 target_link_libraries(beerlog
PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::WebSockets componentsplugin) PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::WebSockets componentsplugin)

View File

@@ -2,19 +2,19 @@
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QLocale> #include <QLocale>
#include <QTranslator>
#include <QQmlContext> #include <QQmlContext>
#include <QTranslator>
#include "models/usersmodel.h"
#include "models/restsmodel.h" #include "models/restsmodel.h"
#include "models/usersmodel.h"
#include "viewmodels/usersviewmodel.h" #include "viewmodels/benchmarkviewmodel.h"
#include "viewmodels/productsviewmodel.h"
#include "viewmodels/ordersviewmodel.h" #include "viewmodels/ordersviewmodel.h"
#include "viewmodels/storesviewmodel.h" #include "viewmodels/productsviewmodel.h"
#include "viewmodels/restsviewmodel.h" #include "viewmodels/restsviewmodel.h"
#include "viewmodels/settingsviewmodel.h" #include "viewmodels/settingsviewmodel.h"
#include "viewmodels/benchmarkviewmodel.h" #include "viewmodels/storesviewmodel.h"
#include "viewmodels/usersviewmodel.h"
#include "services/beerservice.h" #include "services/beerservice.h"
#include "services/modelsregister.h" #include "services/modelsregister.h"
@@ -38,11 +38,15 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
const QUrl url(QStringLiteral("qrc:/main.qml")); const QUrl url(QStringLiteral("qrc:/main.qml"));
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, QObject::connect(
&app, [url](QObject *obj, const QUrl &objUrl) { &engine,
if (!obj && url == objUrl) &QQmlApplicationEngine::objectCreated,
QCoreApplication::exit(-1); &app,
}, Qt::QueuedConnection); [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl)
QCoreApplication::exit(-1);
},
Qt::QueuedConnection);
engine.addImportPath("qrc:/"); engine.addImportPath("qrc:/");