diff options
Diffstat (limited to 'tests/qmlcamera/main.cpp')
| -rw-r--r-- | tests/qmlcamera/main.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/qmlcamera/main.cpp b/tests/qmlcamera/main.cpp index e486601b..0a8d9817 100644 --- a/tests/qmlcamera/main.cpp +++ b/tests/qmlcamera/main.cpp @@ -16,17 +16,18 @@ ** ****************************************************************************/ -#include "qtquick2applicationviewer.h" #include <QtDataVisualization/qutils.h> #include <QtGui/QGuiApplication> #include <QtCore/QDir> +#include <QtQuick/QQuickView> +#include <QtQml/QQmlEngine> int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - QtQuick2ApplicationViewer viewer; + QQuickView viewer; // Enable antialiasing viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat()); @@ -34,15 +35,16 @@ int main(int argc, char *argv[]) // 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"))); + QString extraImportPath(QStringLiteral("%1/../../../%2")); #else - viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString extraImportPath(QStringLiteral("%1/../../%2")); #endif - viewer.setMainQmlFile(QStringLiteral("qml/qmlcamera/main.qml")); + viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), + QString::fromLatin1("qml"))); + + viewer.setSource(QUrl("qrc:/qml/qmlcamera/main.qml")); viewer.setResizeMode(QQuickView::SizeRootObjectToView); - viewer.showExpanded(); + viewer.show(); return app.exec(); } |