Commit 009361e6 authored by Nicolas Fella's avatar Nicolas Fella

Merge branch 'abouticon' into 'master'

Abouticon

See merge request kde/ktrip!5
parents 7f325149 5e91fdc2
......@@ -39,7 +39,6 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_subdirectory(src)
install(FILES org.kde.ktrip.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
install(FILES org.kde.ktrip.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
......
......@@ -38,5 +38,7 @@ else()
target_link_libraries(ktrip PRIVATE Qt5::Widgets)
endif()
install(FILES org.kde.ktrip.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
install(TARGETS ktrip ${INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS org.kde.ktrip.desktop DESTINATION ${KDE_INSTALL_APPDIR})
......@@ -27,6 +27,8 @@
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QImage>
#ifdef Q_OS_ANDROID
#include <QGuiApplication>
#else
......@@ -88,6 +90,7 @@ int main(int argc, char *argv[])
KAboutData about(QStringLiteral("ktrip"), i18n("KTrip"), QStringLiteral("0.1"), i18n("Public transport assistant"),
KAboutLicense::GPL, i18n("© 2019 KDE Community"));
about.addAuthor(i18n("Nicolas Fella"), QString(), QStringLiteral("nicolas.fella@gmx.de"));
about.setProgramLogo(QImage(QStringLiteral(":/org.kde.ktrip.svg")));
KAboutData::setApplicationData(about);
engine.rootContext()->setContextProperty(QStringLiteral("_aboutData"), QVariant::fromValue(about));
......
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>qml/main.qml</file>
<file>qml/BackendPage.qml</file>
<file>qml/JourneyQueryPage.qml</file>
<file>qml/ConnectionsPage.qml</file>
<file>qml/LocationQueryPage.qml</file>
<file>qml/ConnectionDetailsPage.qml</file>
<file>qml/DatePickerButton.qml</file>
<file>qml/TimePickerButton.qml</file>
<file>qml/DepartureQueryPage.qml</file>
<file>qml/DeparturesPage.qml</file>
<file>qml/TimePicker.qml</file>
<file>qml/Hand.qml</file>
<file>qml/DateInput.qml</file>
<file>qml/ClockFace.qml</file>
<file>qml/ClockElement.qml</file>
<file>qtquickcontrols2.conf</file>
</qresource>
<RCC>
<qresource prefix="/">
<file>qml/main.qml</file>
<file>qml/BackendPage.qml</file>
<file>qml/JourneyQueryPage.qml</file>
<file>qml/ConnectionsPage.qml</file>
<file>qml/LocationQueryPage.qml</file>
<file>qml/ConnectionDetailsPage.qml</file>
<file>qml/DatePickerButton.qml</file>
<file>qml/TimePickerButton.qml</file>
<file>qml/DepartureQueryPage.qml</file>
<file>qml/DeparturesPage.qml</file>
<file>qml/TimePicker.qml</file>
<file>qml/Hand.qml</file>
<file>qml/DateInput.qml</file>
<file>qml/ClockFace.qml</file>
<file>qml/ClockElement.qml</file>
<file>qtquickcontrols2.conf</file>
<file>org.kde.ktrip.svg</file>
</qresource>
</RCC>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment