diff options
Diffstat (limited to 'tests/qmlcamera/main.cpp')
| -rw-r--r-- | tests/qmlcamera/main.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/qmlcamera/main.cpp b/tests/qmlcamera/main.cpp index c93502f7..e486601b 100644 --- a/tests/qmlcamera/main.cpp +++ b/tests/qmlcamera/main.cpp @@ -16,9 +16,11 @@ ** ****************************************************************************/ +#include "qtquick2applicationviewer.h" #include <QtDataVisualization/qutils.h> + #include <QtGui/QGuiApplication> -#include "qtquick2applicationviewer.h" +#include <QtCore/QDir> int main(int argc, char *argv[]) { @@ -29,13 +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(QCoreApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); #endif viewer.setMainQmlFile(QStringLiteral("qml/qmlcamera/main.qml")); viewer.setResizeMode(QQuickView::SizeRootObjectToView); |