HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2523:abf0d5005e35

Fix qml application deployment for android...

Heikkinen Miikka -

r2523:abf0d5005e35

parent child

Context file:

r2523:abf0d5005e35

Collapse all files

demos/demos.pri +20 0

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             TEMPLATE = app
             QT += core gui
             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
+                } else:contains(TARGET, quick2.*) {
+                    charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
+                    charts_qmldir.path = /assets/qml/QtCommercial/Chart
+                    charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
+                    charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
+                    INSTALLS += charts_qmldir charts_qmlplugin
+                }
+            }

demos/qmlaxes/main.cpp +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #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/qmlaxes/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlchart/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #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/qmlchart/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlcustomizations/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #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/qmlcustomizations/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlcustomlegend/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #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/qmlcustomlegend/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlcustommodel/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <QtDeclarative>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QAbstractItemModel>
+            #include <QDir>
             #include "declarativemodel.h"
             #include "customtablemodel.h"
             #include "qmlapplicationviewer.h"
             const char *uri = "QmlCustomModel";
             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
                 // @uri QmlCustomModel
                 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                                QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                 qmlRegisterType<DeclarativeTableModel>(uri, 1, 0, "CustomModel");
                 qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "CustomModelElement");
                 // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlcustommodel/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlf1legends/main.cpp +8 -2

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
-            //#include <QDeclarativeContext>
+            #include <QtDeclarative/QDeclarativeEngine>
             #include <QDebug>
+            #include <QDir>
             #include "qmlapplicationviewer.h"
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QmlApplicationViewer viewer;
-                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/qmlf1legends/main.qml"));
                 viewer.setRenderHint(QPainter::Antialiasing, true);
                 viewer.showExpanded();
                 return app->exec();
             }

demos/qmloscilloscope/main.cpp +8 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <QtDeclarative/QDeclarativeContext>
+            #include <QtDeclarative/QDeclarativeEngine>
+            #include <QDir>
             #include "qmlapplicationviewer.h"
             #include "datasource.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
                 DataSource dataSource(viewer.data());
                 viewer->rootContext()->setContextProperty("dataSource", &dataSource);
                 // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmloscilloscope/main.qml"));
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlpolarchart/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #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/qmlpolarchart/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlweather/main.cpp +8 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <QtDeclarative/QDeclarativeContext>
+            #include <QtDeclarative/QDeclarativeEngine>
             #include <QDebug>
+            #include <QDir>
             #include "qmlapplicationviewer.h"
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QmlApplicationViewer viewer;
-                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);
                 QString appKey;
                 if (argc > 1) {
                     appKey = argv[1];
                     qDebug() << "App key for worldweatheronline.com:" << appKey;
                 } else {
                     qWarning() << "No app key for worldweatheronline.com given. Using static test data instead of live data.";
                 }
                 viewer.rootContext()->setContextProperty("weatherAppKey", appKey);
                 viewer.setSource(QUrl("qrc:/qml/qmlweather/main.qml"));
                 viewer.setRenderHint(QPainter::Antialiasing, true);
                 viewer.showExpanded();
                 return app->exec();
             }

demos/quick2chart/main.cpp +7 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtWidgets/QApplication>
             #include <QtQuick/QQuickItem>
+            #include <QDir>
+            #include <QtQml/QQmlEngine>
             #include "qtquick2applicationviewer.h"
             int main(int argc, char *argv[])
             {
                 QApplication app(argc, argv);
                 QtQuick2ApplicationViewer viewer;
+            #ifdef Q_OS_ANDROID
+                viewer.addImportPath(QString::fromLatin1("assets:/qml"));
+                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("qml")));
+            #endif
                 viewer.setSource(QUrl("qrc:/qml/quick2chart/main.qml"));
                 viewer.showExpanded();
                 return app.exec();
             }

demos/quick2oscilloscope/main.cpp +7 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtWidgets/QApplication>
             #include <QtQuick/QQuickItem>
             #include <QtQml/QQmlContext>
+            #include <QtQml/QQmlEngine>
+            #include <QDir>
             #include "qtquick2applicationviewer.h"
             #include "datasource.h"
             int main(int argc, char *argv[])
             {
                 QApplication app(argc, argv);
                 QtQuick2ApplicationViewer viewer;
+            #ifdef Q_OS_ANDROID
+                viewer.addImportPath(QString::fromLatin1("assets:/qml"));
+                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("qml")));
+            #endif
                 DataSource dataSource(&viewer);
                 viewer.rootContext()->setContextProperty("dataSource", &dataSource);
                 viewer.setSource(QUrl("qrc:/qml/quick2oscilloscope/main.qml"));
                 viewer.showExpanded();
                 return app.exec();
             }

examples/examples.pri +14 0

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             TEMPLATE = app
             QT += core gui
             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
+                }
+            }

examples/qmlpiechart/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #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"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

tests/auto/qml/tst_qml.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtTest/QtTest>
             #include <QDeclarativeEngine>
             #include <QDeclarativeComponent>
+            #include <QDir>
             #include "tst_definitions.h"
             class tst_QML : public QObject
             {
                 Q_OBJECT
             public slots:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
             private slots:
                 void checkPlugin_data();
                 void checkPlugin();
             private:
                 QString componentErrors(const QDeclarativeComponent* component) const;
                 QString imports_1_1();
                 QString imports_1_3();
             };
             QString tst_QML::componentErrors(const QDeclarativeComponent* component) const
             {
                 Q_ASSERT(component);
                 QStringList errors;
                 foreach (QDeclarativeError const& error, component->errors()) {
                     errors  << error.toString();
                 }
                 return errors.join("\n");
             }
             QString tst_QML::imports_1_1()
             {
                 return "import QtQuick 1.0 \n"
                        "import QtCommercial.Chart 1.1 \n";
             }
             QString tst_QML::imports_1_3()
             {
                 return "import QtQuick 1.0 \n"
                        "import QtCommercial.Chart 1.3 \n";
             }
             void tst_QML::initTestCase()
             {
             }
             void tst_QML::cleanupTestCase()
             {
             }
             void tst_QML::init()
             {
             }
             void tst_QML::cleanup()
             {
             }
             void tst_QML::checkPlugin_data()
             {
                 QTest::addColumn<QString>("source");
                 QTest::newRow("createChartView") <<  imports_1_1() + "ChartView{}";
                 QTest::newRow("XYPoint") << imports_1_1() + "XYPoint{}";
                 QTest::newRow("scatterSeries") <<  imports_1_1() + "ScatterSeries{}";
                 QTest::newRow("lineSeries") <<  imports_1_1() + "LineSeries{}";
                 QTest::newRow("splineSeries") <<  imports_1_1() + "SplineSeries{}";
                 QTest::newRow("areaSeries") <<  imports_1_1() + "AreaSeries{}";
                 QTest::newRow("barSeries") << imports_1_1() + "BarSeries{}";
                 QTest::newRow("stackedBarSeries") << imports_1_1() + "StackedBarSeries{}";
                 QTest::newRow("precentBarSeries") << imports_1_1() + "PercentBarSeries{}";
                 QTest::newRow("horizonatlBarSeries") << imports_1_1() + "HorizontalBarSeries{}";
                 QTest::newRow("horizonatlStackedBarSeries") << imports_1_1() + "HorizontalStackedBarSeries{}";
                 QTest::newRow("horizonatlstackedBarSeries") << imports_1_1() + "HorizontalPercentBarSeries{}";
                 QTest::newRow("pieSeries") << imports_1_1() + "PieSeries{}";
                 QTest::newRow("PieSlice") << imports_1_1() + "PieSlice{}";
                 QTest::newRow("BarSet") << imports_1_1() + "BarSet{}";
                 QTest::newRow("HXYModelMapper") << imports_1_1() + "HXYModelMapper{}";
                 QTest::newRow("VXYModelMapper") << imports_1_1() + "VXYModelMapper{}";
                 QTest::newRow("HPieModelMapper") << imports_1_1() + "HPieModelMapper{}";
                 QTest::newRow("HPieModelMapper") << imports_1_1() + "HPieModelMapper{}";
                 QTest::newRow("HBarModelMapper") << imports_1_1() + "HBarModelMapper{}";
                 QTest::newRow("VBarModelMapper") << imports_1_1() + "VBarModelMapper{}";
                 QTest::newRow("ValueAxis") << imports_1_1() + "ValueAxis{}";
             #ifndef QT_ON_ARM
                 QTest::newRow("DateTimeAxis") << imports_1_1() + "DateTimeAxis{}";
             #endif
                 QTest::newRow("CategoryAxis") << imports_1_1() + "CategoryAxis{}";
                 QTest::newRow("CategoryRange") << imports_1_1() + "CategoryRange{}";
                 QTest::newRow("BarCategoryAxis") << imports_1_1() + "BarCategoryAxis{}";
                 QTest::newRow("createPolarChartView") <<  imports_1_3() + "PolarChartView{}";
                 QTest::newRow("LogValueAxis") <<  imports_1_3() + "LogValueAxis{}";
             }
             void tst_QML::checkPlugin()
             {
                 QFETCH(QString, source);
                 QDeclarativeEngine engine;
-                engine.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports")));
+            #ifdef Q_OS_ANDROID
+                engine.addImportPath(QString::fromLatin1("assets:/imports"));
+                engine.addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
+            #else
+                engine.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
+            #endif
                 QDeclarativeComponent component(&engine);
                 component.setData(source.toLatin1(), QUrl());
                 QVERIFY2(!component.isError(), qPrintable(componentErrors(&component)));
                 TRY_COMPARE(component.status(), QDeclarativeComponent::Ready);
                 QObject *obj = component.create();
                 QVERIFY(obj != 0);
                 //
                 //TODO:
                 //  QCOMPARE(obj->property("something").toInt(), 0);
                 delete obj;
             }
             QTEST_MAIN(tst_QML)
             #include "tst_qml.moc"

tests/qmlchartaxis/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <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/qmlchartaxis/main.qml"));
                 viewer->showExpanded();
                 return app->exec();
             }

tests/qmlchartproperties/main.cpp +7 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include <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/qmlchartproperties/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

tests/quick2chartproperties/main.cpp +7 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtWidgets/QApplication>
             #include <QtQuick/QQuickItem>
+            #include <QDir>
+            #include <QtQml/QQmlEngine>
             #include "qtquick2applicationviewer.h"
             int main(int argc, char *argv[])
             {
                 QApplication app(argc, argv);
                 QtQuick2ApplicationViewer viewer;
+            #ifdef Q_OS_ANDROID
+                viewer.addImportPath(QString::fromLatin1("assets:/qml"));
+                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("qml")));
+            #endif
                 viewer.setSource(QUrl("qrc:/qml/quick2chartproperties/main.qml"));
                 viewer.showExpanded();
                 return app.exec();
             }

tests/tests.pri +20 0

             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = app
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
             # 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
+                } else:contains(TARGET, quick2.*) {
+                    charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
+                    charts_qmldir.path = /assets/qml/QtCommercial/Chart
+                    charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
+                    charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
+                    INSTALLS += charts_qmldir charts_qmlplugin
+                }
+            }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages