diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-15 10:52:05 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-15 09:55:12 +0000 |
| commit | f779dfc5b9212bc3b362cd1b3ebe9f1aff377869 (patch) | |
| tree | 87a6988ecd58f8e92bf5c98948a002e5786d8ff2 /examples | |
| parent | 6840953c3f4c28c4e7cb2a5a87ee4c43514c1be9 (diff) | |
Deploy the built-in Android modules by default
Only require explicitly enabling the support packages, which must
be also linked to in the gradle build script.
.pro:
ANDROID_SUPPORT = v4 v7
build.gradle:
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:21.0.+'
compile 'com.android.support:cardview-v7:21.0.+'
compile 'com.android.support:recyclerview-v7:21.0.+'
compile 'com.android.support:support-v4:21.0.+'
}
Change-Id: I2ac122fd383b3c7bfa6c3ec3569cd7f7f13ff971
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qmlandroid/catalog/android/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | examples/qmlandroid/catalog/catalog.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/qmlandroid/catalog/android/AndroidManifest.xml b/examples/qmlandroid/catalog/android/AndroidManifest.xml index e203ab7..94433bd 100644 --- a/examples/qmlandroid/catalog/android/AndroidManifest.xml +++ b/examples/qmlandroid/catalog/android/AndroidManifest.xml @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='utf-8'?> <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:theme="@android:style/Theme.Material.Light.DarkActionBar"> - <service android:name="qt.android.app.QtNativeService" /> + <service android:name="org.qtproject.qt5.android.bindings.app.QtNativeService" /> <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" - android:name="qt.android.app.QtNativeActivity" + android:name="org.qtproject.qt5.android.bindings.app.QtNativeActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop"> diff --git a/examples/qmlandroid/catalog/catalog.pro b/examples/qmlandroid/catalog/catalog.pro index 4e133d3..a79f092 100644 --- a/examples/qmlandroid/catalog/catalog.pro +++ b/examples/qmlandroid/catalog/catalog.pro @@ -22,7 +22,7 @@ DISTFILES += \ android/gradle/wrapper/gradle-wrapper.properties ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -QMLANDROID_PACKAGES = app support view widget +ANDROID_SUPPORT = v4 v7 target.path = $$[QT_INSTALL_EXAMPLES]/qmlandroid/catalog INSTALLS += target |