diff options
Diffstat (limited to 'examples/qmlmultigraph/main.cpp')
| -rw-r--r-- | examples/qmlmultigraph/main.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/examples/qmlmultigraph/main.cpp b/examples/qmlmultigraph/main.cpp index 12c52019..95201da5 100644 --- a/examples/qmlmultigraph/main.cpp +++ b/examples/qmlmultigraph/main.cpp @@ -16,14 +16,11 @@ ** ****************************************************************************/ +#include "qtquick2applicationviewer.h" #include <QtDataVisualization/qutils.h> + #include <QtGui/QGuiApplication> -#include "qtquick2applicationviewer.h" -#ifdef Q_OS_ANDROID -#include <QDir> -#include <QQmlEngine> -#endif -#include <QDebug> +#include <QtCore/QDir> int main(int argc, char *argv[]) { @@ -34,10 +31,14 @@ int main(int argc, char *argv[]) // Enable antialiasing viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat()); -#ifdef Q_OS_ANDROID - viewer.addImportPath(QString::fromLatin1("assets:/qml")); - viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), - QString::fromLatin1("lib"))); + // The following are needed to make examples run without having to install the module + // in desktop environments. +#ifdef Q_OS_WIN + viewer.addImportPath(QString::fromLatin1("%1/../../../%2").arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); +#else + viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); #endif viewer.setTitle(QStringLiteral("QML multigraph example")); viewer.setSource(QUrl("qrc:/qml/qmlmultigraph/main.qml")); |