diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2012-12-14 14:14:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 16:56:00 +0100 |
| commit | d13a7a1f8949c4fab37783064cfba27a49757608 (patch) | |
| tree | 63ee82ca0ff636fe4e966781662bb30efeb4f03a /examples/multimedia/video/qmlvideo/main.cpp | |
| parent | 0f2fc9ffd93f080a1f1eeb78ac47ca585fa0362a (diff) | |
Examples: Remove qmlapplicationviewer template.v5.0.0
Fix shadow-builds for qmlviewer examples by using qrc files instead.
Task-number: QTBUG-28614
Change-Id: Iec993f95166ffd09e8edff552ceca5bc4112d293
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/multimedia/video/qmlvideo/main.cpp')
| -rw-r--r-- | examples/multimedia/video/qmlvideo/main.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp index 86b91482b..8230e9441 100644 --- a/examples/multimedia/video/qmlvideo/main.cpp +++ b/examples/multimedia/video/qmlvideo/main.cpp @@ -43,9 +43,10 @@ #include <QtCore/QString> #include <QtCore/QStringList> #include <QtQml/QQmlContext> +#include <QtQml/QQmlEngine> #include <QtGui/QGuiApplication> #include <QtQuick/QQuickItem> -#include "qmlapplicationviewer.h" +#include <QtQuick/QQuickView> #include "trace.h" #ifdef PERFORMANCEMONITOR_SUPPORT @@ -108,9 +109,10 @@ int main(int argc, char *argv[]) url2 = QUrl::fromLocalFile(source2); } - QmlApplicationViewer viewer; + QQuickView viewer; + viewer.setSource(QUrl("qrc:///qml/qmlvideo/main.qml")); + QObject::connect(viewer.engine(), SIGNAL(quit()), &viewer, SLOT(close())); - viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml")); QQuickItem *rootObject = viewer.rootObject(); rootObject->setProperty("source1", url1); rootObject->setProperty("source2", url2); @@ -133,7 +135,7 @@ int main(int argc, char *argv[]) QMetaObject::invokeMethod(rootObject, "init"); - viewer.showExpanded(); + viewer.show(); return app.exec(); } |