path: root/src/corelib
diff options
authorEskil Abrahamsen Blomfeldt <>2013-04-26 16:23:16 +0200
committerThe Qt Project <>2013-05-01 11:24:15 +0200
commit522c7ba1acaa02904e810662017b19e55c328d11 (patch)
treee9055a8988120bb8d05495ba2c2eb9f54a66279d /src/corelib
parent94bed3ad148a6ecba91c0a32e0ee52deda3aec9f (diff)
Enable bundling Qt in Android package in build system
For bundling Qt, we need two things: 1. We need to build a regular .jar file out of the Java files, so that they can be built into the app package. Dexing the classes first (i.e. compiling the JVM bytecode to Dalvik bytecode) is required for loading the .jar file at run-time, but cannot be used for building it into the app, so we need two different paths. 2. We need to specify which extra files have to be bundled for each module (this is primarily for plugins and imports). This is because there is no static dependency on these files, so it cannot be detected during deployment. Task-number: QTBUG-30751 Change-Id: I733603ee5d1c64bd7c5b9357eb5d993b9d0298f7 Reviewed-by: Paul Olav Tvete <> Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'src/corelib')
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/ b/src/corelib/
index 3b7eb11229..0a5cc04a17 100644
--- a/src/corelib/
+++ b/src/corelib/
@@ -21,6 +21,8 @@ ANDROID_JAR_DEPENDENCIES = \
plugins/platforms/android/ \
+ jar/QtAndroid-bundled.jar