improved desktop UI

[mardrone] / mardrone / mardrone.pro

diff --git a/mardrone/mardrone.pro b/mardrone/mardrone.pro
index f31027e..9772352 100644 (file)
--- a/mardrone/mardrone.pro
+++ b/mardrone/mardrone.pro
@@ -58,7 +58,8 @@ SOURCES += main.cpp\
     qdeclarativetoucharea.cpp \
     gauges/gaugearc.cpp \
     uilistelement.cpp \
-    gauges/gaugehsi.cpp
+    gauges/gaugehsi.cpp \
+    qmlappviewer.cpp
 
 INCLUDEPATH += dronelib \
                gauges \
@@ -81,7 +82,9 @@ HEADERS  +=  dronelib/dronecontrol.h \
     qdeclarativetoucharea.h \
     gauges/gaugearc.h \
     uilistelement.h \
-    gauges/gaugehsi.h
+    gauges/gaugehsi.h \
+    qmlappviewer.h
+
 
 system(pkg-config --exists sdl):!android{
     message("I have sdl")
@@ -201,7 +204,9 @@ OTHER_FILES += \
     android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
     android/AndroidManifest.xml \
     deploy.pri \
-    android/version.xml
+    android/version.xml \
+    ardrone_android.qml \
+    ConfigDialogAndroid.qml
 
 unix:!symbian:!android {
     maemo5 {
@@ -234,15 +239,25 @@ RESOURCES += \
 android {
 qtcomponents.source = imports
 qtcomponents.target =
+# Themes are needed only for MeeGo components
 themes.source = themes
 themes.target =
 DEPLOYMENTFOLDERS = qtcomponents themes
 
+# For MeeGo components for android
 qmlplugins.files = plugins/libmeegoplugin.so
 qmlplugins.files += plugins/libmeegoextrasplugin.so
+# Common
 qmlplugins.files += plugins/libqtcomponentsplugin_1_1.so
-qmlplugins.path = /libs/armeabi
-
+# for Symbian components for Android, comment out if not used
+qmlplugins.files += plugins/libandroidplugin_1_1.so
+   x86 {
+      qmlplugins.path = /libs/x86
+    } else: armeabi-v7a {
+            qmlplugins.path = /libs/armeabi-v7a
+    } else {
+            qmlplugins.path = /libs/armeabi
+   }
 INSTALLS += qmlplugins
 }
 
@@ -283,3 +298,7 @@ ios:include($$[QMAKE_MKSPECS]/common/ios/qiosapp.conf)
 
 
 
+
+
+
+