Commit 7885c843 authored by Luigi Toscano's avatar Luigi Toscano

Merge remote-tracking branch 'origin/0.4'

parents a1ca107d f9593770
......@@ -94,6 +94,8 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
KLocalizedString::setApplicationDomain("elisa");
#if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
qInfo() << QCoreApplication::arguments();
......@@ -109,8 +111,6 @@ int main(int argc, char *argv[])
QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("elisa")));
KLocalizedString::setApplicationDomain("elisa");
KAboutData aboutData( QStringLiteral("elisa"),
i18n("Elisa"),
QStringLiteral(ELISA_VERSION_STRING),
......@@ -128,8 +128,6 @@ int main(int argc, char *argv[])
KAboutData::setApplicationData(aboutData);
KLocalizedString::setApplicationDomain("elisa");
QCommandLineParser parser;
parser.addHelpOption();
parser.addVersionOption();
......
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