diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
| commit | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (patch) | |
| tree | 406ffa7e3ae0a346a14175ccccb8ac7e596d8f8f /examples/multimedia/video/qmlvideofx/qmlvideofx.pro | |
| parent | fa9fe9ff8c3aba25fbae4f8f32588dd6477d6df8 (diff) | |
| parent | f0e0d5d901d4e28fff9f29caf86ada84906b3db4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/winrt/qwinrtcameracontrol.cpp
Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
Diffstat (limited to 'examples/multimedia/video/qmlvideofx/qmlvideofx.pro')
| -rw-r--r-- | examples/multimedia/video/qmlvideofx/qmlvideofx.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro index 678ba4c97..097ad7516 100644 --- a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro +++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro @@ -14,3 +14,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideofx INSTALLS += target QMAKE_INFO_PLIST = Info.plist + +EXAMPLE_FILES += \ + qmlvideofx.png \ + qmlvideofx.svg |