summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-10-17 05:59:10 -0700
committerScott Murray <scott.murray@konsulko.com>2019-10-24 08:16:48 +0000
commit7595b00d081e44ddff94cd4c51cc8c20f49f2f2d (patch)
treeed77ac7a4ac1874fb9111a4afded24e77dc7762d
parent3c804a94a22289ab766243629c41ba96ac989bd7 (diff)
ondemandnavi: remove DESKTOP define
With switchover over to afb agl-service-navigation it will be unlikely to run on a desktop system. Bug-AGL: SPEC-2880 Change-Id: I56819383a9fc2e18323cbd33044dfa4d544f1ab5 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--README.md5
-rw-r--r--app/app.pro5
-rw-r--r--app/main.cpp42
-rw-r--r--navigation.pro4
4 files changed, 0 insertions, 56 deletions
diff --git a/README.md b/README.md
index 5d21a3a..5ce38c3 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,3 @@ example
"mapStyleUrls":"mapbox://styles/mapbox/dark-v9",
"enableOSM:false
}
-
-#Qt Creator
-If you want to start from Qt Creater
-add 'DEFINES * = DESKTOP' to project > build step > additional argument
-
diff --git a/app/app.pro b/app/app.pro
index 8783f53..e881bc5 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -2,11 +2,6 @@ TARGET = navigation
QT = quick qml aglextras
PKGCONFIG += qlibhomescreen qlibwindowmanager
-equals(DEFINES, "DESKTOP"){
- QT -= aglextras
- PKGCONFIG -= qlibhomescreen qlibwindowmanager
-}
-
QT += positioning
QT += dbus
QT += core
diff --git a/app/main.cpp b/app/main.cpp
index 0c10209..aa7768b 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -15,21 +15,9 @@
* limitations under the License.
*/
-#ifdef DESKTOP
-#define USE_QTAGLEXTRAS 0
-#define USE_QLIBWINDOWMANAGER 0
-#else
-#define USE_QTAGLEXTRAS 0
-#define USE_QLIBWINDOWMANAGER 1
-#endif
-
-#if USE_QTAGLEXTRAS
-#include <QtAGLExtras/AGLApplication>
-#elif USE_QLIBWINDOWMANAGER
#include <qlibwindowmanager.h>
#include <qlibhomescreen.h>
#include <string>
-#endif
#include <QtCore/QDebug>
#include <QtCore/QCommandLineParser>
#include <QtCore/QUrlQuery>
@@ -56,13 +44,6 @@ int main(int argc, char *argv[])
return 1;
}
-#if USE_QTAGLEXTRAS
- AGLApplication app(argc, argv);
- app.setApplicationName("navigation");
- app.setupApplicationRole("navigation");
- app.load(QUrl(QStringLiteral("qrc:/navigation.qml")));
-
-#elif USE_QLIBWINDOWMANAGER
QGuiApplication app(argc, argv);
QString graphic_role = QString("navigation");
int port = 1700;
@@ -131,29 +112,6 @@ int main(int argc, char *argv[])
DBus_Server dbus(map);
dbus_server_navigationcore dbus_navigationcore(map);
-#else // for only libwindowmanager
- QGuiApplication app(argc, argv);
- app.setApplicationName("navigation");
-
- // Load qml
- QQmlApplicationEngine engine;
-
- MarkerModel model;
- engine.rootContext()->setContextProperty("markerModel", &model);
-
- Guidance_Module guidance;
- engine.rootContext()->setContextProperty("guidanceModule", &guidance);
-
- File_Operation file;
- engine.rootContext()->setContextProperty("fileOperation", &file);
-
- engine.load(QUrl(QStringLiteral("qrc:/navigation.qml")));
- QObject *map = engine.rootObjects().first()->findChild<QObject*>("map");
- DBus_Server dbus(map);
- dbus_server_navigationcore dbus_navigationcore(map);
-
-#endif
-
return app.exec();
}
diff --git a/navigation.pro b/navigation.pro
index 78409ab..bb839fa 100644
--- a/navigation.pro
+++ b/navigation.pro
@@ -3,9 +3,5 @@ TEMPLATE = subdirs
SUBDIRS = dbus_interface \
app package
-equals(DEFINES, "DESKTOP"){
- SUBDIRS -= package
-}
-
package.depends += dbus_interface \
app