summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-08-29 09:09:55 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-08-29 09:10:13 +0300
commit11949906fe5d59ebb209e8cf508f5edd0836111e (patch)
tree43a3da0f21cdf824382bf55204890a2907a04867 /examples
parent21f35f25fa6362f97141da1505f8a1eddb4a52df (diff)
Android qml crash fix, part 2
Task-number: QTRD-2136 Scatter works, bars still crashes. Change-Id: I69a7d2a8e873bfed55f3c29ee36be288ea949f96 Change-Id: I69a7d2a8e873bfed55f3c29ee36be288ea949f96 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pri4
-rw-r--r--examples/qmlbarchart/qmlbarchart.pro8
2 files changed, 3 insertions, 9 deletions
diff --git a/examples/examples.pri b/examples/examples.pri
index 48d2f29a..f1cf3b3b 100644
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -13,6 +13,8 @@ win32 {
LIBS += -L$$OUT_PWD/../../lib
+TEMPLATE = app
+
QT += datavis3d
contains(TARGET, qml.*) {
@@ -62,7 +64,7 @@ contains(TARGET, qml.*) {
android {
android_qmldir.files = $$copy_qmldir_examples.target
- android_qmldir.path = /assets/imports/$$make_qmldir_target
+ android_qmldir.path = /assets/qml/$$uri_replaced
android_qmlplugin.files = $$copy_lib.target
android_qmlplugin.path = $$target.path
INSTALLS += android_qmldir android_qmlplugin
diff --git a/examples/qmlbarchart/qmlbarchart.pro b/examples/qmlbarchart/qmlbarchart.pro
index ef609ef6..3d716438 100644
--- a/examples/qmlbarchart/qmlbarchart.pro
+++ b/examples/qmlbarchart/qmlbarchart.pro
@@ -10,17 +10,9 @@ DEPLOYMENTFOLDERS = folder_01
# Additional import path used to resolve QML modules in Creator's code model
QML_IMPORT_PATH =
-# If your application uses the Qt Mobility libraries, uncomment the following
-# lines and add the respective components to the MOBILITY variable.
-# CONFIG += mobility
-# MOBILITY +=
-
# The .cpp file which was generated for your project. Feel free to hack it.
SOURCES += main.cpp
-# Installation path
-# target.path =
-
# Please do not modify the following two lines. Required for deployment.
include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
qtcAddDeployment()