diff options
| author | Heikkinen Miikka <miikka.heikkinen@digia.com> | 2013-05-22 09:49:28 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-05-22 10:12:28 +0300 |
| commit | abf0d5005e357dd2fe59ccf02412687f72e56cb5 (patch) | |
| tree | 00d421bf283728f936693d280b2469cb027d342c /examples | |
| parent | e2eb16a7c3b113365d1de6a9d5c04b7d31147432 (diff) | |
Fix qml application deployment for android
Change-Id: I5a693f3ca7d6110505f8e6d276f53825e1a5961b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pri | 14 | ||||
| -rw-r--r-- | examples/qmlpiechart/main.cpp | 8 |
2 files changed, 21 insertions, 1 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index 33c9b2bc..4948dcb3 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -14,3 +14,17 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets # staticlib config causes problems when building executables staticlib: CONFIG-=staticlib + +android { + # Workaround to fix android deployment, which seems to always look for target in + # OUT_PWD instead of DESTDIR. + QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so + + contains(TARGET, qml.*) { + charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir + charts_qmldir.path = /assets/imports/QtCommercial/Chart + charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so + charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH + INSTALLS += charts_qmldir charts_qmlplugin + } +} diff --git a/examples/qmlpiechart/main.cpp b/examples/qmlpiechart/main.cpp index 04bc8531..b698ca6b 100644 --- a/examples/qmlpiechart/main.cpp +++ b/examples/qmlpiechart/main.cpp @@ -20,13 +20,19 @@ #include <QApplication> #include <QtDeclarative/QDeclarativeEngine> +#include <QDir> #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) { QScopedPointer<QApplication> app(createApplication(argc, argv)); QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create()); - viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports"))); +#ifdef Q_OS_ANDROID + viewer->addImportPath(QString::fromLatin1("assets:/imports")); + viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib"))); +#else + viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports"))); +#endif // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setSource(QUrl("qrc:/qml/qmlpiechart/main.qml")); |