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/multimedia/multimedia.pro | |
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/multimedia/multimedia.pro')
-rw-r--r-- | src/multimedia/multimedia.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index b16a792fb..acde6fe8e 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -12,8 +12,6 @@ MODULE_PLUGIN_TYPES = \ QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf -load(qt_module) - INCLUDEPATH *= . PRIVATE_HEADERS += \ @@ -87,3 +85,5 @@ ANDROID_FEATURES += \ win32: LIBS_PRIVATE += -luuid HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) |