slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Examples: Remove qmlapplicationviewer template.

Browse Source 
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:
Kai Koehne
2012-12-14 14:14:01 +01:00
committed by The Qt Project
parent 0f2fc9ffd9
commit d13a7a1f89
13 changed files with 118 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/multimedia/video/qmlvideofx/main.cpp
View File

@@ -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

4
examples/multimedia/video/qmlvideofx/qmlvideofx.pro
View File

@@ -1,6 +1,8 @@
TEMPLATE = app
TARGET = qmlvideofx
QT += quick
LOCAL_SOURCES = filereader.cpp main.cpp
LOCAL_HEADERS = filereader.h trace.h
@@ -17,7 +19,5 @@ maemo6: {
DEFINES += SMALL_SCREEN_PHYSICAL
}
include(qmlapplicationviewer/qmlapplicationviewer.pri)
target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideofx
INSTALLS += target

52
examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
View File

@@ -1,10 +1,48 @@
<RCC>
<qresource prefix="/images">
<file alias="close.png">images/close.png</file>
<file alias="folder.png">images/folder.png</file>
<file alias="titlebar.png">images/titlebar.png</file>
<file alias="titlebar.sci">images/titlebar.sci</file>
<file alias="up.png">images/up.png</file>
<file alias="qt-logo.png">images/qt-logo.png</file>
<qresource prefix="/">
<file>images/close.png</file>
<file>images/folder.png</file>
<file>images/titlebar.png</file>
<file>images/titlebar.sci</file>
<file>images/up.png</file>
<file>images/qt-logo.png</file>
<file>qml/qmlvideofx/Button.qml</file>
<file>qml/qmlvideofx/Content.qml</file>
<file>qml/qmlvideofx/ContentCamera.qml</file>
<file>qml/qmlvideofx/ContentImage.qml</file>
<file>qml/qmlvideofx/ContentVideo.qml</file>
<file>qml/qmlvideofx/DisableScreenSaver.qml</file>
<file>qml/qmlvideofx/Divider.qml</file>
<file>qml/qmlvideofx/Effect.qml</file>
<file>qml/qmlvideofx/EffectBillboard.qml</file>
<file>qml/qmlvideofx/EffectBlackAndWhite.qml</file>
<file>qml/qmlvideofx/EffectEmboss.qml</file>
<file>qml/qmlvideofx/EffectGaussianBlur.qml</file>
<file>qml/qmlvideofx/EffectGlow.qml</file>
<file>qml/qmlvideofx/EffectIsolate.qml</file>
<file>qml/qmlvideofx/EffectMagnify.qml</file>
<file>qml/qmlvideofx/EffectPageCurl.qml</file>
<file>qml/qmlvideofx/EffectPassThrough.qml</file>
<file>qml/qmlvideofx/EffectPixelate.qml</file>
<file>qml/qmlvideofx/EffectPosterize.qml</file>
<file>qml/qmlvideofx/EffectRipple.qml</file>
<file>qml/qmlvideofx/EffectSelectionPanel.qml</file>
<file>qml/qmlvideofx/EffectSepia.qml</file>
<file>qml/qmlvideofx/EffectSharpen.qml</file>
<file>qml/qmlvideofx/EffectShockwave.qml</file>
<file>qml/qmlvideofx/EffectSobelEdgeDetection1.qml</file>
<file>qml/qmlvideofx/EffectSobelEdgeDetection2.qml</file>
<file>qml/qmlvideofx/EffectTiltShift.qml</file>
<file>qml/qmlvideofx/EffectToon.qml</file>
<file>qml/qmlvideofx/EffectVignette.qml</file>
<file>qml/qmlvideofx/EffectWarhol.qml</file>
<file>qml/qmlvideofx/EffectWobble.qml</file>
<file>qml/qmlvideofx/FileBrowser.qml</file>
<file>qml/qmlvideofx/FileOpen.qml</file>
<file>qml/qmlvideofx/HintedMouseArea.qml</file>
<file>qml/qmlvideofx/main-largescreen.qml</file>
<file>qml/qmlvideofx/main-smallscreen.qml</file>
<file>qml/qmlvideofx/ParameterPanel.qml</file>
<file>qml/qmlvideofx/Slider.qml</file>
</qresource>
</RCC>