summaryrefslogtreecommitdiffstats
path: root/examples/qmlsurface
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2013-12-16 11:36:00 +0200
committerTitta Heikkala <titta.heikkala@digia.com>2013-12-16 12:09:45 +0200
commita39754cf88b03f1eb665082c16e0dea94c84089f (patch)
tree3a6a62b7227d4505f6f03c104b0df6d7588b0e75 /examples/qmlsurface
parent9a1e8f34990afaf3c0fb6d44e936f5f03b9a3636 (diff)
Fix qmlbars layout and viewer for qml examples
The ui for the qmlbars is constructed with a layout so that the table and buttons are usable on different platforms. The qtquick2applicationviewer is modified so that the target is set correctly for android. Change-Id: I2121ff891fe3da631bedcdc796b3d4d112e6edd2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples/qmlsurface')
-rw-r--r--examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri10
1 files changed, 10 insertions, 0 deletions
diff --git a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri
index a071e63d..e5f7990f 100644
--- a/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri
+++ b/examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri
@@ -61,6 +61,16 @@ android-no-sdk {
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 =