summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/video/qmlvideofx/main.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2012-12-14 14:14:01 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-17 16:56:00 +0100
commitd13a7a1f8949c4fab37783064cfba27a49757608 (patch)
tree63ee82ca0ff636fe4e966781662bb30efeb4f03a /examples/multimedia/video/qmlvideofx/main.cpp
parent0f2fc9ffd93f080a1f1eeb78ac47ca585fa0362a (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/qmlvideofx/main.cpp')
-rw-r--r--examples/multimedia/video/qmlvideofx/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/multimedia/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp
index 92e476a1e..9f47a9c17 100644
--- a/examples/multimedia/video/qmlvideofx/main.cpp
+++ b/examples/multimedia/video/qmlvideofx/main.cpp
@@ -44,8 +44,8 @@
#include <QtQml/QQmlContext>
#include <QtGui/QGuiApplication>
#include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickView>
#include "filereader.h"
-#include "qmlapplicationviewer.h"
#include "trace.h"
#ifdef SMALL_SCREEN_LAYOUT
@@ -97,9 +97,9 @@ int main(int argc, char *argv[])
}
}
- QmlApplicationViewer viewer;
+ QQuickView viewer;
- viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile);
+ viewer.setSource(QLatin1String("qrc:///qml/qmlvideofx/") + MainQmlFile);
QQuickItem *rootObject = viewer.rootObject();
rootObject->setProperty("fileName", fileName);
viewer.rootObject()->setProperty("volume", volume);
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
#ifdef SMALL_SCREEN_PHYSICAL
viewer.showFullScreen();
#else
- viewer.showExpanded();
+ viewer.show();
#endif
// Delay invocation of init until the event loop has started, to work around