Examples: Remove qmlapplicationviewer template.
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>
This commit is contained in:
committed by
The Qt Project
parent
0f2fc9ffd9
commit
d13a7a1f89
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user