AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Add tokens for androiddeployqt in template files

Browse Source 
Make it possible for the androiddeployqt tool to replace certain
parts of the template with data from the .pro file.

Task-number: QTBUG-32856
Change-Id: Iaedd2076bc1ea5dac0b94624c0ba3a755d2a08f3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2013-09-05 13:21:33 +02:00 committed by The Qt Project
parent a6f1123fe5
commit 580d816bb8
3 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/android/java/AndroidManifest.xml
View File

@ -1,37 +1,40 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.qtproject.example"> <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1">
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name"> <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
<activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden|navigation" > <activity android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden|navigation"
android:name="org.qtproject.qt5.android.bindings.QtActivity"
android:label="@string/app_name"
android:screenOrientation="unspecified">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> <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:value="@string/repository" android:name="android.app.repository"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/> <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.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
<meta-data android:name="android.app.lib_name" android:value=""/> <meta-data android:value="@string/app_lib_name" android:name="android.app.lib_name"/>
<!-- Deploy Qt libs as part of package --> <!-- Deploy Qt libs as part of package -->
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/> <meta-data android:value="1" android:name="android.app.bundle_local_qt_libs"/>
<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_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"/> <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
<!-- Run with local libs --> <!-- Run with local libs -->
<meta-data android:name="android.app.use_local_qt_libs" android:value="1"/> <meta-data android:value="1" android:name="android.app.use_local_qt_libs"/>
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/> <meta-data android:value="/data/local/tmp/qt/" android:name="android.app.libs_prefix"/>
<meta-data android:name="android.app.load_local_libs" android:value=""/> <meta-data android:value="@string/local_libs" android:name="android.app.load_local_libs"/>
<meta-data android:name="android.app.load_local_jars" android:value=""/> <meta-data android:value="@string/local_jars" android:name="android.app.load_local_jars"/>
<meta-data android:name="android.app.static_init_classes" android:value=""/> <meta-data android:value="@string/init_classes" android:name="android.app.static_init_classes"/>
<!-- Messages maps --> <!-- Messages maps -->
<meta-data android:name="android.app.ministro_not_found_msg" android:value="@string/ministro_not_found_msg"/> <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
<meta-data android:name="android.app.ministro_needed_msg" android:value="@string/ministro_needed_msg"/> <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
<meta-data android:name="android.app.fatal_error_msg" android:value="@string/fatal_error_msg"/> <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
<!-- Messages maps --> <!-- Messages maps -->
<!-- Splash screen --> <!-- Splash screen -->
<meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/> <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/>
<!-- Splash screen --> <!-- Splash screen -->
</activity> </activity>
</application> </application>
<uses-sdk android:targetSdkVersion="14" android:minSdkVersion="9"/> <!-- %%INSERT_USES_SDK%% -->
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <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.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

23
src/android/java/res/values/libs.xml
View File

@ -4,10 +4,23 @@
<item>https://download.qt-project.org/ministro/android/qt5/latest</item> <item>https://download.qt-project.org/ministro/android/qt5/latest</item>
</array> </array>
<string name="repository">default</string> <string name="repository">default</string>
<array name="qt_libs">
<item>Qt5Core</item> <!-- The following is handled automatically by the deployment tool. It should
not be edited manually. -->
<array name="bundled_libs">
<!-- %%INSERT_EXTRA_LIBS%% -->
</array> </array>
<array name="bundled_libs"/>
<array name="bundled_in_lib" /> <array name="qt_libs">
<array name="bundled_in_assets" /> <!-- %%INSERT_QT_LIBS%% -->
</array>
<array name="bundled_in_lib">
<!-- %%INSERT_BUNDLED_IN_LIB%% -->
</array>
<array name="bundled_in_assets">
<!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
</array>
</resources> </resources>

7
src/android/java/res/values/strings.xml
View File

@ -1,6 +1,11 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<resources> <resources>
<string name="app_name"></string> <string name="app_name"><!-- %%INSERT_APP_NAME%% --></string>
<string name="app_lib_name"><!-- %%INSERT_APP_LIB_NAME%% --></string>
<string name="local_libs"><!-- %%INSERT_LOCAL_LIBS%% --></string>
<string name="local_jars"><!-- %%INSERT_LOCAL_JARS%% --></string>
<string name="init_classes"><!-- %%INSERT_INIT_CLASSES%% --></string>
<string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string> <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
<string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string> <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
<string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string> <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>