diff --git a/nota.pro b/nota.pro index a6e94e5..bb1c889 100644 --- a/nota.pro +++ b/nota.pro @@ -1,61 +1,72 @@ QT *= qml \ quick \ sql CONFIG += ordered CONFIG += c++17 TARGET = nota TEMPLATE = app +VERSION_MAJOR = 1 +VERSION_MINOR = 0 +VERSION_BUILD = 0 + +VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_BUILD} + +DEFINES += NOTA_VERSION_STRING=\\\"$$VERSION\\\" + linux:unix:!android { message(Building for Linux KDE) QT += webengine LIBS += -lMauiKit } else:android { message(Building for Android) QMAKE_LINK += -nostdlib++ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android_files DEFINES *= \ COMPONENT_FM \ COMPONENT_TAGGING \ COMPONENT_EDITOR \ MAUIKIT_STYLE \ ANDROID_OPENSSL include($$PWD/3rdparty/kirigami/kirigami.pri) include($$PWD/3rdparty/mauikit/mauikit.pri) DEFINES += STATIC_KIRIGAMI } else { message("Unknown configuration") } DEFINES += QT_DEPRECATED_WARNINGS SOURCES += \ $$PWD/src/main.cpp \ $$PWD/src/models/documentsmodel.cpp HEADERS += \ $$PWD/src/models/documentsmodel.h RESOURCES += \ $$PWD/src/qml.qrc \ $$PWD/assets/img_assets.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = # Additional import path used to resolve QML modules just for Qt Quick Designer QML_DESIGNER_IMPORT_PATH = # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target + +#include($$PWD/version.pri) + diff --git a/src/main.cpp b/src/main.cpp index 18094cf..facee24 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,59 +1,61 @@ #include #include #include +#ifndef STATIC_MAUIKIT #include "nota_version.h" +#endif #ifdef Q_OS_ANDROID #include #else #include #endif #ifdef STATIC_KIRIGAMI #include "3rdparty/kirigami/src/kirigamiplugin.h" #endif #ifdef STATIC_MAUIKIT #include "3rdparty/mauikit/src/mauikit.h" #endif #include "src/models/documentsmodel.h" Q_DECL_EXPORT int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #ifdef Q_OS_ANDROID QGuiApplication app(argc, argv); if (!MAUIAndroid::checkRunTimePermissions()) return -1; #else QApplication app(argc, argv); #endif app.setApplicationName("nota"); app.setApplicationVersion(NOTA_VERSION_STRING); app.setApplicationDisplayName("Nota"); app.setOrganizationName("Maui"); app.setOrganizationDomain("org.maui.nota"); app.setWindowIcon(QIcon(":/nota.svg")); #ifdef STATIC_KIRIGAMI KirigamiPlugin::getInstance().registerTypes(); #endif #ifdef STATIC_MAUIKIT MauiKit::getInstance().registerTypes(); #endif qmlRegisterType ("org.maui.nota", 1, 0, "Documents"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); if (engine.rootObjects().isEmpty()) return -1; return app.exec(); }