diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-11-20 16:20:51 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-11-20 16:21:38 +0100 |
| commit | 7221ed82d292fc20007b0d1a7953efd28fff3d22 (patch) | |
| tree | d3677f2cdc790e6585f3e414376a42b9fcc82657 /src/multimedia/multimedia.pro | |
| parent | 4b25972f9b478677ad2ba816f9601117acde8f19 (diff) | |
| parent | 5135ffaf2a9d6969f2a113041d8d336e397bc661 (diff) | |
| download | qtmultimedia-7221ed82d292fc20007b0d1a7953efd28fff3d22.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I8e0f222f110cc23b426f2d68416f5cc3982e30f2
Diffstat (limited to 'src/multimedia/multimedia.pro')
| -rw-r--r-- | src/multimedia/multimedia.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index e3f368cf4..b16a792fb 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -26,7 +26,8 @@ PRIVATE_HEADERS += \ qmediaresourcepolicy_p.h \ qmediaresourceset_p.h \ qmediastoragelocation_p.h \ - qmediaopenglhelper_p.h + qmediaopenglhelper_p.h \ + qmultimediautils_p.h PUBLIC_HEADERS += \ qmediabindableinterface.h \ @@ -53,7 +54,8 @@ SOURCES += \ qmediaresourcepolicy_p.cpp \ qmediaresourceset_p.cpp \ qmediastoragelocation.cpp \ - qmultimedia.cpp + qmultimedia.cpp \ + qmultimediautils.cpp CONFIG += simd optimize_full |