Ui selection code improved

[mardrone] / mardrone / mardrone.pro

diff --git a/mardrone/mardrone.pro b/mardrone/mardrone.pro
index 00de90c..ac9ebb8 100644 (file)
--- a/mardrone/mardrone.pro
+++ b/mardrone/mardrone.pro
@@ -24,7 +24,8 @@ DEFINES+=HAVE_SDL
 #For Android
 android {
  LIBS += -L../mardrone/ardrone-lib-android -lvlib -lsdk
-#/home/kate/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
+# If you got cannot locate '__aeabi_f2uiz'..., uncomment following and point libgcc.a
+ LIBS += ~/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
 }
 
 
@@ -55,8 +56,7 @@ SOURCES += main.cpp\
     qdeclarativetoucharea.cpp \
     gauges/gaugearc.cpp \
     uilistelement.cpp \
-    gauges/gaugehsi.cpp \
-    gauges/gaugeplugin.cpp
+    gauges/gaugehsi.cpp
 
 INCLUDEPATH += dronelib \
                gauges \
@@ -81,7 +81,7 @@ HEADERS  +=  dronelib/dronecontrol.h \
     uilistelement.h \
     gauges/gaugehsi.h
 
-system(pkg-config --exists sdl){
+system(pkg-config --exists sdl):!android{
     message("I have sdl")
     DEFINES+=HAVE_SDL
     SOURCES +=
@@ -165,9 +165,43 @@ OTHER_FILES += \
     android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
     android/src/org/kde/necessitas/origo/QtActivity.java \
     android/src/org/kde/necessitas/origo/QtApplication.java \
+    android/version.xml \
+    android/res/drawable-ldpi/icon.png \
+    android/res/drawable-mdpi/icon.png \
+    android/res/drawable-hdpi/icon.png \
+    android/res/drawable/icon.png \
+    android/res/drawable/logo.png \
+    android/res/values/libs.xml \
+    android/res/values/strings.xml \
+    android/res/layout/splash.xml \
+    android/res/values-et/strings.xml \
+    android/res/values-zh-rCN/strings.xml \
+    android/res/values-zh-rTW/strings.xml \
+    android/res/values-es/strings.xml \
+    android/res/values-nb/strings.xml \
+    android/res/values-ms/strings.xml \
+    android/res/values-it/strings.xml \
+    android/res/values-pl/strings.xml \
+    android/res/values-id/strings.xml \
+    android/res/values-pt-rBR/strings.xml \
+    android/res/values-rs/strings.xml \
+    android/res/values-fr/strings.xml \
+    android/res/values-ro/strings.xml \
+    android/res/values-nl/strings.xml \
+    android/res/values-de/strings.xml \
+    android/res/values-ja/strings.xml \
+    android/res/values-ru/strings.xml \
+    android/res/values-fa/strings.xml \
+    android/res/values-el/strings.xml \
+    android/src/org/kde/necessitas/origo/QtActivity.java \
+    android/src/org/kde/necessitas/origo/QtApplication.java \
+    android/src/org/kde/necessitas/ministro/IMinistro.aidl \
+    android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
+    android/AndroidManifest.xml \
+    deploy.pri \
     android/version.xml
 
-unix:!symbian {
+unix:!symbian:!android {
     maemo5 {
         target.path = /opt/usr/bin
     } else {
@@ -176,7 +210,7 @@ unix:!symbian {
     INSTALLS += target
 }
 
-unix:!symbian {
+unix:!symbian:!android {
     desktopfile.files = $${TARGET}.desktop
     maemo5 {
         desktopfile.path = /usr/share/applications/hildon
@@ -192,6 +226,28 @@ unix:!symbian {
 RESOURCES += \
     ardrone.qrc
 
+# Add more folders to ship with the application, here
+#folder_01.source = qml/meegocomponents1
+#folder_01.target = qml
+android {
+qtcomponents.source = imports
+qtcomponents.target =
+themes.source = themes
+themes.target =
+DEPLOYMENTFOLDERS = qtcomponents themes
+
+qmlplugins.files = plugins/libmeegoplugin.so
+qmlplugins.files += plugins/libmeegoextrasplugin.so
+qmlplugins.files += plugins/libqtcomponentsplugin_1_1.so
+qmlplugins.path = /libs/armeabi
+
+INSTALLS += qmlplugins
+}
+
+# Please do not modify the following two lines. Required for deployment.
+include(deploy.pri)
+qtcAddDeployment()
+
 ios:include($$[QMAKE_MKSPECS]/common/ios/qiosapp.conf)
 
 
@@ -222,3 +278,6 @@ ios:include($$[QMAKE_MKSPECS]/common/ios/qiosapp.conf)
 
 
 
+
+
+