X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=android%2FAndroidManifest.xml;h=968b7f5ab29aa2053c58493038908abb6841e671;hp=24b3ccddf5c3cc7a30119a6d3a0e00550795fd9f;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=1c90d94fb2928df0503b1e47f4f3a3d64b136ef1

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 24b3ccd..968b7f5 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,8 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+   This file is part of the PulseView project.
+
+   Copyright (C) 2014 Marcus Comstedt <marcus@mc.pp.se>
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.sigrok.pulseview"
-		android:versionName="0.2.0"
-		android:versionCode="20"
+		android:versionName="0.4.0"
+		android:versionCode="40"
 		android:installLocation="auto">
 	<application android:hardwareAccelerated="true"
 		 android:name="org.sigrok.pulseview.PulseViewApplication"
@@ -23,20 +41,20 @@
 			<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
 			<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
 			<!-- Deploy Qt libs as part of package -->
-			<meta-data android:name="android.app.bundle_local_qt_libs" android:value="0"/>
+			<meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
 			<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
 			<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
 			<!-- Run with local libs -->
-			<meta-data android:name="android.app.use_local_qt_libs" android:value="0"/>
+			<meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
 			<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
 			<meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so"/>
 			<meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidAccessibility.jar:jar/QtAndroid-bundled.jar:jar/QtAndroidAccessibility-bundled.jar"/>
 			<meta-data android:name="android.app.static_init_classes" android:value=""/>
-			<!--  Messages maps -->
+			<!-- Messages maps -->
 			<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
 			<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
 			<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-			<!--  Messages maps -->
+			<!-- Messages maps -->
 			<!-- Splash screen -->
 			<!--
 			<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>