From d9810079a961fabf2ef40dcd2c8f1c2ab1f44f80 Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Tue, 5 Nov 2019 15:23:19 -0500 Subject: [PATCH] Adapt template to app being built. --- CMakeLists.txt | 8 +++----- README.md | 6 +++--- org.eyecreate.qiflora.appdata.xml | 13 +++++++++++++ ...ra.desktop => org.eyecreate.qiflora.desktop | 0 ....qiflora.json => org.eyecreate.qiflora.json | 2 +- org.kde.qiflora.appdata.xml | 18 ------------------ src/main.cpp | 4 ++-- 7 files changed, 22 insertions(+), 29 deletions(-) create mode 100644 org.eyecreate.qiflora.appdata.xml rename org.kde.qiflora.desktop => org.eyecreate.qiflora.desktop (100%) rename org.kde.qiflora.json => org.eyecreate.qiflora.json (95%) delete mode 100644 org.kde.qiflora.appdata.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index e815982..007acda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,14 +33,12 @@ find_package(KF5Kirigami2 ${KF5_MIN_VERSION}) ################# Enable C++11 features for clang and gcc ################# -if(UNIX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x") -endif() +set(CMAKE_CXX_STANDARD 11) ################# build and install ################# add_subdirectory(src) -install(PROGRAMS org.kde.qiflora.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -install(FILES org.kde.qiflora.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) +install(PROGRAMS org.eyecreate.qiflora.desktop DESTINATION ${KDE_INSTALL_APPDIR}) +install(FILES org.eyecreate.qiflora.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/README.md b/README.md index f665ee3..987346e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# Kirigami application template +# QiFlora -This repository can be used as a template to develop Plasma Mobile applications. -It already includes templates for the qml ui, a c++ part, app metadata and flatpak packaging. +Mobile friendly application to monitor Mi Flora devices. +Plants using this device will have thier data logged when app is used and graphed to better monitor plant health. # Usage See [docs.plasma-mobile.org](https://docs.plasma-mobile.org/AppDevelopment.html). diff --git a/org.eyecreate.qiflora.appdata.xml b/org.eyecreate.qiflora.appdata.xml new file mode 100644 index 0000000..a1927c2 --- /dev/null +++ b/org.eyecreate.qiflora.appdata.xml @@ -0,0 +1,13 @@ + + + org.eyecreate.qiflora + QiFlora + Mobile friendly application to monitor Mi Flora devices. + FSFAP + GPL-3+ + eyecreate + +

Mobile friendly application to monitor Mi Flora devices.

+

Plants using this device will have thier data logged when app is used and graphed to better monitor plant health.

+
+
diff --git a/org.kde.qiflora.desktop b/org.eyecreate.qiflora.desktop similarity index 100% rename from org.kde.qiflora.desktop rename to org.eyecreate.qiflora.desktop diff --git a/org.kde.qiflora.json b/org.eyecreate.qiflora.json similarity index 95% rename from org.kde.qiflora.json rename to org.eyecreate.qiflora.json index b2ff33c..68421a6 100644 --- a/org.kde.qiflora.json +++ b/org.eyecreate.qiflora.json @@ -1,5 +1,5 @@ { - "id": "org.kde.qiflora", + "id": "org.eyecreate.qiflora", "runtime": "org.kde.Platform", "runtime-version": "5.12", "sdk": "org.kde.Sdk", diff --git a/org.kde.qiflora.appdata.xml b/org.kde.qiflora.appdata.xml deleted file mode 100644 index d0625b7..0000000 --- a/org.kde.qiflora.appdata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - org.kde.qiflora - Kirigami Example Application - A short summary describing what this software is about - A permissive license for this metadata, e.g. "FSFAP" - The license of this software as SPDX string, e.g. "GPL-3+" - The software vendor name, e.g. "ACME Corporation" - -

Multiple paragraphs of long description, describing this software component.

-

You can also use ordered and unordered lists:

-
    -
  • Feature 1
  • -
  • Feature 2
  • -
-

Keep in mind to XML-escape characters, and that this is not HTML markup.

-
-
diff --git a/src/main.cpp b/src/main.cpp index 6b7ac04..3c34d25 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,8 +7,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) { QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); - QCoreApplication::setOrganizationName("KDE"); - QCoreApplication::setOrganizationDomain("kde.org"); + QCoreApplication::setOrganizationName("eyecreate"); + QCoreApplication::setOrganizationDomain("eyecreate.org"); QCoreApplication::setApplicationName("qiflora"); QQmlApplicationEngine engine; -- GitLab