diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:52 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:52:58 +0200 |
commit | 7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847 (patch) | |
tree | 0fb34738dd5b4abd222ffac7b25f904c456006d9 /examples/multimedia | |
parent | badecdbc46df6ada383f1dfd006fa3dfff1706c6 (diff) | |
parent | a6cc1af0546ab10701c10475315139ebb50ad1e5 (diff) | |
download | qtmultimedia-7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
Diffstat (limited to 'examples/multimedia')
5 files changed, 5 insertions, 3 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro index 71701543e..b5bcf844a 100644 --- a/examples/multimedia/audiodevices/audiodevices.pro +++ b/examples/multimedia/audiodevices/audiodevices.pro @@ -14,3 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices INSTALLS += target QT+=widgets +include(../../shared/shared.pri) diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro index b0dc57c27..029ca7e0f 100644 --- a/examples/multimedia/audioinput/audioinput.pro +++ b/examples/multimedia/audioinput/audioinput.pro @@ -10,3 +10,4 @@ SOURCES = audioinput.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput INSTALLS += target +include(../../shared/shared.pri) diff --git a/examples/multimedia/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro index 79d6caf23..593c30096 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.pro +++ b/examples/multimedia/audiorecorder/audiorecorder.pro @@ -20,3 +20,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder INSTALLS += target QT+=widgets +include(../../shared/shared.pri) diff --git a/examples/multimedia/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro index f0345f1e5..6dcf42a40 100644 --- a/examples/multimedia/declarative-camera/declarative-camera.pro +++ b/examples/multimedia/declarative-camera/declarative-camera.pro @@ -6,8 +6,6 @@ QT += quick qml multimedia SOURCES += qmlcamera.cpp RESOURCES += declarative-camera.qrc -QMAKE_INFO_PLIST = Info.plist - target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-camera INSTALLS += target - +include(../../shared/shared.pri) diff --git a/examples/multimedia/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro index 76aa02cdf..17c850255 100644 --- a/examples/multimedia/spectrum/app/app.pro +++ b/examples/multimedia/spectrum/app/app.pro @@ -83,3 +83,4 @@ macx { QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN } } +include(../../../shared/shared.pri) |