Changeset View
Changeset View
Standalone View
Standalone View
src/apps/marble-maps/main.cpp
1 | // | 1 | // | ||
---|---|---|---|---|---|
2 | // This file is part of the Marble Virtual Globe. | 2 | // This file is part of the Marble Virtual Globe. | ||
3 | // | 3 | // | ||
4 | // This program is free software licensed under the GNU LGPL. You can | 4 | // This program is free software licensed under the GNU LGPL. You can | ||
5 | // find a copy of this license in LICENSE.txt in the top directory of | 5 | // find a copy of this license in LICENSE.txt in the top directory of | ||
6 | // the source code. | 6 | // the source code. | ||
7 | // | 7 | // | ||
8 | // Copyright 2015 Gábor Péterffy <peterffy95@gmail.com> | 8 | // Copyright 2015 Gábor Péterffy <peterffy95@gmail.com> | ||
9 | // | 9 | // | ||
10 | 10 | | |||
11 | #include <QApplication> | 11 | #include <QApplication> | ||
12 | #include <QQmlApplicationEngine> | 12 | #include <QQmlApplicationEngine> | ||
13 | #include <QtQuick> | 13 | #include <QtQuick> | ||
14 | 14 | | |||
15 | #include "config-marble.h" | ||||
15 | #include "declarative/MarbleDeclarativePlugin.h" | 16 | #include "declarative/MarbleDeclarativePlugin.h" | ||
16 | #include <MarbleGlobal.h> | 17 | #include <MarbleGlobal.h> | ||
17 | #include "MarbleMaps.h" | 18 | #include "MarbleMaps.h" | ||
18 | #include "MarbleDirs.h" | 19 | #include "MarbleDirs.h" | ||
19 | #include "TextToSpeechClient.h" | 20 | #include "TextToSpeechClient.h" | ||
20 | 21 | | |||
21 | using namespace Marble; | 22 | using namespace Marble; | ||
22 | 23 | | |||
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Line(s) | |||||
97 | { | 98 | { | ||
98 | QApplication app(argc, argv); | 99 | QApplication app(argc, argv); | ||
99 | app.setApplicationName( "Marble Maps" ); | 100 | app.setApplicationName( "Marble Maps" ); | ||
100 | app.setOrganizationName( "KDE" ); | 101 | app.setOrganizationName( "KDE" ); | ||
101 | app.setOrganizationDomain( "kde.org" ); | 102 | app.setOrganizationDomain( "kde.org" ); | ||
102 | #if QT_VERSION >= 0x050700 | 103 | #if QT_VERSION >= 0x050700 | ||
103 | app.setDesktopFileName(QStringLiteral("org.kde.marble.maps")); | 104 | app.setDesktopFileName(QStringLiteral("org.kde.marble.maps")); | ||
104 | #endif | 105 | #endif | ||
106 | #ifdef APPLE_STANDARD_UNIX_BUILD | ||||
107 | QSettings::setDefaultFormat(QSettings::IniFormat); | ||||
108 | #endif | ||||
105 | 109 | | |||
106 | // Load Qt translation system catalog for libmarblewidget, the plugins and this app | 110 | // Load Qt translation system catalog for libmarblewidget, the plugins and this app | ||
107 | loadTranslations(app); | 111 | loadTranslations(app); | ||
108 | 112 | | |||
109 | MarbleDeclarativePlugin declarativePlugin; | 113 | MarbleDeclarativePlugin declarativePlugin; | ||
110 | const char uri[] = "org.kde.marble"; | 114 | const char uri[] = "org.kde.marble"; | ||
111 | declarativePlugin.registerTypes(uri); | 115 | declarativePlugin.registerTypes(uri); | ||
112 | qmlRegisterType<MarbleMaps>(uri, 0, 20, "MarbleMaps"); | 116 | qmlRegisterType<MarbleMaps>(uri, 0, 20, "MarbleMaps"); | ||
Show All 10 Lines |