summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLasse Räihä <lasse.raiha@digia.com>2013-04-18 10:45:07 +0300
committerKimmo Ollila <kimmo.ollila@digia.com>2013-04-18 10:50:20 +0300
commite24b16c50642f0baa238bde3b29d75e95d1048a7 (patch)
treead06a992d075b807328419b8f7c056bc4333bdcb
parent89321bc50127050e1b00623d0f31fbda100d1bf9 (diff)
Added AndroidManifest -file. Removed unnecessary style-property
Change-Id: Ib1af093e7a2076804e37d87a3607b1a623f93c93 Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>
-rw-r--r--QtDemo/android/AndroidManifest.xml37
-rw-r--r--QtDemo/qml/QtDemo/style.js1
2 files changed, 37 insertions, 1 deletions
diff --git a/QtDemo/android/AndroidManifest.xml b/QtDemo/android/AndroidManifest.xml
new file mode 100644
index 0000000..20fee87
--- /dev/null
+++ b/QtDemo/android/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest android:versionCode="1" package="org.qtproject.example.QtDemo" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0">
+ <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
+ <activity android:name="org.qtproject.qt5.android.bindings.QtActivity"
+ android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden"
+ android:screenOrientation="landscape"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+ <meta-data android:name="android.app.repository" android:value="@string/repository"/>
+ <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"/>
+ <meta-data android:name="android.app.lib_name" android:value="QtDemo"/>
+ <!-- Run with local libs -->
+ <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="libs/libgnustl_shared.so:plugins/platforms/android/libqtforandroidGL.so:"/>
+ <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:"/>
+ <meta-data android:name="android.app.static_init_classes" android:value=":"/>
+ <!-- Messages maps -->
+ <meta-data android:name="android.app.ministro_not_found_msg" android:value="@string/ministro_not_found_msg"/>
+ <meta-data android:name="android.app.ministro_needed_msg" android:value="@string/ministro_needed_msg"/>
+ <meta-data android:name="android.app.fatal_error_msg" android:value="@string/fatal_error_msg"/>
+ <!-- Messages maps -->
+ <!-- Splash screen -->
+ <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/>
+ <!-- Splash screen -->
+ </activity>
+ </application>
+ <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+</manifest>
diff --git a/QtDemo/qml/QtDemo/style.js b/QtDemo/qml/QtDemo/style.js
index 39565bb..e7cb85e 100644
--- a/QtDemo/qml/QtDemo/style.js
+++ b/QtDemo/qml/QtDemo/style.js
@@ -2,7 +2,6 @@ var APP_WIDTH = 1280
var APP_HEIGHT = 800
var APP_ANIMATION_DELAY = 1000
-var APP_CLICK_TIME = 200
var LOGO_WIDTH = 1006
var LOGO_HEIGHT = 1200