summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-06-27 08:56:22 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-06-27 09:02:18 +0300
commit88b8a2b1e2cb6579709ef0d7d8961ad553b28e5f (patch)
tree45cce06a925c9b568bf6c109e3fa6226597c3c73
parente3893928844769543dbb4314882729acbaaf7584 (diff)
Android QML build fixes
Change-Id: I003c171425a7961b0c803f7d7f27cf3ad787b93c Change-Id: I003c171425a7961b0c803f7d7f27cf3ad787b93c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--examples/examples.pri2
-rw-r--r--src/datavis3dqml2/datavis3dqml2.pro5
2 files changed, 5 insertions, 2 deletions
diff --git a/examples/examples.pri b/examples/examples.pri
index 1de6a9cf..906f7d27 100644
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -50,7 +50,7 @@ contains(TARGET, qml.*) {
src_lib = lib$${lib_name}.dylib
}
} else {
- src_lib = $${lib_name}.so
+ src_lib = lib$${lib_name}.so
}
}
copy_lib.target = $$make_qmldir_path/$$src_lib
diff --git a/src/datavis3dqml2/datavis3dqml2.pro b/src/datavis3dqml2/datavis3dqml2.pro
index 0ac506a3..3e9abd1f 100644
--- a/src/datavis3dqml2/datavis3dqml2.pro
+++ b/src/datavis3dqml2/datavis3dqml2.pro
@@ -6,7 +6,10 @@ CONFIG += qt plugin
TARGET = $$qtLibraryTarget($$TARGET)
uri = com.digia.QtDataVis3D
-staticlib:DEFINES+=QT_DATAVIS3D_STATICLIB
+static {
+ DEFINES += QT_DATAVIS3D_STATICLIB
+ CONFIG -= static staticlib
+}
# Input
INCLUDEPATH += ../datavis3d/engine ../datavis3d/global