diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:17:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:17:53 +0100 |
| commit | 06a9505327f1c8aee70d701037b2cdcc4fc143f6 (patch) | |
| tree | 242cec89d49078e912343afa8fc1ff92c7a8c2db /src/qtmultimediaquicktools | |
| parent | 9500aadc219481d89d32e5c2a2de10b0740c50de (diff) | |
| parent | 3198bf4944edd8f25996c2b4c4516f606165af59 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/avfoundation/mediaplayer/mediaplayer.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
Change-Id: I5742596230dc510ba2a09eba624429bb67179194
Diffstat (limited to 'src/qtmultimediaquicktools')
| -rw-r--r-- | src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index b38f209e3..e1425c3ec 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -1,11 +1,8 @@ TARGET = QtMultimediaQuick_p + QT = core quick multimedia-private CONFIG += internal_module -load(qt_module) - -DEFINES += QT_BUILD_QTMM_QUICK_LIB - # Header files must go inside source directory of a module # to be installed by syncqt. INCLUDEPATH += ../multimedia/qtmultimediaquicktools_headers/ @@ -47,3 +44,5 @@ OTHER_FILES += \ shaders/biplanaryuvvideo_swizzle.frag \ shaders/triplanaryuvvideo.vert \ shaders/triplanaryuvvideo.frag + +load(qt_module) |