From 7f7464df05ede6bcde7689947cf8094596f3f1be Mon Sep 17 00:00:00 2001 From: Kate Alhola Date: Mon, 28 May 2012 12:15:26 +0300 Subject: [PATCH] changelog updated --- mardrone/debian/changelog | 6 ++++++ mardrone/mardrone.pro | 20 +++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mardrone/debian/changelog b/mardrone/debian/changelog index 34c5351..9adcceb 100644 --- a/mardrone/debian/changelog +++ b/mardrone/debian/changelog @@ -1,3 +1,9 @@ +mardrone (0.3.0) unstable; urgency=low + + * Updated support added for android and iOS and video recording + + -- Kate Alhola Tue, 17 Nov 2011 17:16:48 +0200 + mardrone (0.2.0) unstable; urgency=low * Updated support added for desktop Qt components and Joystick diff --git a/mardrone/mardrone.pro b/mardrone/mardrone.pro index f31027e..ea2fc49 100644 --- a/mardrone/mardrone.pro +++ b/mardrone/mardrone.pro @@ -201,7 +201,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 +236,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 +295,5 @@ ios:include($$[QMAKE_MKSPECS]/common/ios/qiosapp.conf) + + -- 1.7.9.5