1 files changed, 29 insertions, 8 deletions
diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
index b6931d04..1134cbcd 100644
--- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,4 +1,4 @@
-# checksum 0x5b42 version 0x70013
+# checksum 0x77b version 0x80016
 # This file was generated by the Qt Quick Application wizard of Qt Creator.
 # The code below adds the QmlApplicationViewer to the project and handles the
 # activation of QML debugging.
@@ -22,7 +22,7 @@ contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
     DEFINES += HARMATTAN_BOOSTER
 }
 # This file was generated by an application wizard of Qt Creator.
-# The code below handles deployment to Symbian and Maemo, aswell as copying
+# The code below handles deployment to Android and Maemo, aswell as copying
 # of the application data to shadow build directories on desktop.
 # It is recommended not to modify this file, since newer versions of Qt Creator
 # may offer an updated version of it.
@@ -30,7 +30,11 @@ contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
 defineTest(qtcAddDeployment) {
 for(deploymentfolder, DEPLOYMENTFOLDERS) {
     item = item$${deploymentfolder}
-    itemsources = $${item}.sources
+    greaterThan(QT_MAJOR_VERSION, 4) {
+        itemsources = $${item}.files
+    } else {
+        itemsources = $${item}.sources
+    }
     $$itemsources = $$eval($${deploymentfolder}.source)
     itempath = $${item}.path
     $$itempath= $$eval($${deploymentfolder}.target)
@@ -41,9 +45,28 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) {
 
 MAINPROFILEPWD = $$PWD
 
-symbian {
-    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
-    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+android {
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = /assets/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+
+    x86 {
+        target.path = /libs/x86
+    } else: armeabi-v7a {
+        target.path = /libs/armeabi-v7a
+    } else {
+        target.path = /libs/armeabi
+    }
+
+    export(target.path)
+    INSTALLS += target
 } else:win32 {
     copyCommand =
     for(deploymentfolder, DEPLOYMENTFOLDERS) {
@@ -141,8 +164,6 @@ symbian {
 export (ICON)
 export (INSTALLS)
 export (DEPLOYMENT)
-export (TARGET.EPOCHEAPSIZE)
-export (TARGET.CAPABILITY)
 export (LIBS)
 export (QMAKE_EXTRA_TARGETS)
 }