diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:50:03 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:51:20 +0200 |
| commit | 07aba602fc82ac31684988f8e8e22521d2b3c982 (patch) | |
| tree | 7ae1da139e8661bf157f996fe71844031d2995f4 /examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri | |
| parent | cf0cf6ca67aec8ae480bb705443ea17f5ab9f9e2 (diff) | |
| parent | ea0442bc81ae034d22c5742b6075dee993fdd54d (diff) | |
Merge branch 'develop' into mergebranch
Conflicts:
examples/qmlbars/qml/qmlbars/main.qml
examples/qmlscatter/qml/qmlscatter/main.qml
examples/qmlsurface/qml/qmlsurface/main.qml
src/datavisualization/data/qitemmodelbardatamapping.cpp
src/datavisualization/data/qitemmodelscatterdatamapping.cpp
src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
src/datavisualization/engine/drawer.cpp
Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1
Diffstat (limited to 'examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri')
| -rw-r--r-- | examples/qmlsurface/qtquick2applicationviewer/qtquick2applicationviewer.pri | 10 |
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 = |