diff options
Diffstat (limited to 'examples/qmloscilloscope/main.cpp')
| -rw-r--r-- | examples/qmloscilloscope/main.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/examples/qmloscilloscope/main.cpp b/examples/qmloscilloscope/main.cpp index 8cbaba71..175dfa1c 100644 --- a/examples/qmloscilloscope/main.cpp +++ b/examples/qmloscilloscope/main.cpp @@ -17,14 +17,11 @@ ****************************************************************************/ #include "datasource.h" +#include "qtquick2applicationviewer.h" #include <QtDataVisualization/qutils.h> + #include <QtGui/QGuiApplication> -#include "qtquick2applicationviewer.h" -#ifdef Q_OS_ANDROID #include <QtCore/QDir> -#include <QtQml/QQmlEngine> -#endif -#include <QtCore/QDebug> #include <QtQml/QQmlContext> int main(int argc, char *argv[]) @@ -36,10 +33,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("Oscilloscope example")); |