Use material styling on android and package icon for about page.
This commit is contained in:
@@ -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})
|
||||
|
||||
@@ -6,12 +6,17 @@
|
||||
#include "miflora/bluetoothdevices.h"
|
||||
#include <KAboutData>
|
||||
#include <QIcon>
|
||||
#include <QtQuickControls2/QQuickStyle>
|
||||
|
||||
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;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file alias="main.qml">contents/ui/main.qml</file>
|
||||
<file alias="logo.svg">../packaging/org.eyecreate.qiflora.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
Reference in New Issue
Block a user