diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fabc210966e8ca317c6e9490d1d5e0215d982aa0..f934651bed34e4de6c1de8fe4330744b5097f0cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,5 +12,5 @@ endif() qt5_add_resources(RESOURCES resources.qrc) add_executable(qiflora ${qiflora_SRCS} ${RESOURCES}) -target_link_libraries(qiflora Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg Qt5::Bluetooth Qt5::Charts KF5::CoreAddons) +target_link_libraries(qiflora Qt5::Core Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::Svg Qt5::Bluetooth Qt5::Charts KF5::CoreAddons) install(TARGETS qiflora ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/main.cpp b/src/main.cpp index 5e06a49558b96b3598f6beeb92b93705d3fa4ef5..b1aa1e24c99424942a905e42ae38aed79ad3b1cd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,12 +6,17 @@ #include "miflora/bluetoothdevices.h" #include #include +#include Q_DECL_EXPORT int main(int argc, char *argv[]) { QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); +#ifdef Q_OS_ANDROID + QQuickStyle::setStyle("Material"); +#endif + KAboutData aboutData("org.eyecreate.qiflora", "QiFlora", "1.1.2", "Mobile friendly application to monitor Mi Flora devices.",KAboutLicense::GPL_V3);//TODO:i18n aboutData.setProductName("qiflora"); aboutData.addAuthor("Kevin Whitaker",QString(),"eyecreate@eyecreate.org","https://www.eyecreate.org"); @@ -21,7 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) QCoreApplication::setOrganizationDomain("eyecreate.org"); QCoreApplication::setApplicationName(aboutData.productName()); QCoreApplication::setApplicationVersion(aboutData.version()); - app.setWindowIcon(QIcon::fromTheme("org.eyecreate.qiflora")); + app.setWindowIcon(QIcon(":/logo.svg")); QQmlApplicationEngine engine; diff --git a/src/resources.qrc b/src/resources.qrc index b2b45f8239a8c97f2c770d09bd9c9d33d92e90ff..b61b9032070a4ca0383ac526a4d875dbd9375616 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,5 +1,6 @@ contents/ui/main.qml + ../packaging/org.eyecreate.qiflora.svg