diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-08-07 09:13:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-08-07 12:28:13 +0000 |
| commit | 6dda96f4d4681f7107931bea4c5a0f3fc35bec8d (patch) | |
| tree | 2e1206e1607899a7ad570795979e1d8473ccd6bf /examples | |
| parent | bfabb13f3f6aaad23a5a5761c011efe1917b1d27 (diff) | |
Move shared example folder to examples/multimedia/shared
The root examples directory should not contains shared folders. In the
past multimedia was the only module installing things there, now the
qtdoc module started doing the same. Let's clean up both.
Task-number: QTBUG-69784
Change-Id: I8ff9d1b899fd589c1f3ec83e11b603431c2e4950
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/audiodevices/audiodevices.pro | 2 | ||||
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.pro | 2 | ||||
| -rw-r--r-- | examples/multimedia/audiorecorder/audiorecorder.pro | 2 | ||||
| -rw-r--r-- | examples/multimedia/declarative-camera/declarative-camera.pro | 2 | ||||
| -rw-r--r-- | examples/multimedia/shared/shared.pri (renamed from examples/shared/shared.pri) | 0 | ||||
| -rw-r--r-- | examples/multimedia/spectrum/app/app.pro | 2 | ||||
| -rw-r--r-- | examples/multimediawidgets/camera/camera.pro | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro index b5bcf844a..55657202b 100644 --- a/examples/multimedia/audiodevices/audiodevices.pro +++ b/examples/multimedia/audiodevices/audiodevices.pro @@ -14,4 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices INSTALLS += target QT+=widgets -include(../../shared/shared.pri) +include(../shared/shared.pri) diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro index 029ca7e0f..708d40d93 100644 --- a/examples/multimedia/audioinput/audioinput.pro +++ b/examples/multimedia/audioinput/audioinput.pro @@ -10,4 +10,4 @@ SOURCES = audioinput.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput INSTALLS += target -include(../../shared/shared.pri) +include(../shared/shared.pri) diff --git a/examples/multimedia/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro index 65eecc7b4..dfd0364a4 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.pro +++ b/examples/multimedia/audiorecorder/audiorecorder.pro @@ -20,4 +20,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder INSTALLS += target QT+=widgets -include(../../shared/shared.pri) +include(../shared/shared.pri) diff --git a/examples/multimedia/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro index 6dcf42a40..2d6e2e759 100644 --- a/examples/multimedia/declarative-camera/declarative-camera.pro +++ b/examples/multimedia/declarative-camera/declarative-camera.pro @@ -8,4 +8,4 @@ RESOURCES += declarative-camera.qrc target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-camera INSTALLS += target -include(../../shared/shared.pri) +include(../shared/shared.pri) diff --git a/examples/shared/shared.pri b/examples/multimedia/shared/shared.pri index 26bdf73cf..26bdf73cf 100644 --- a/examples/shared/shared.pri +++ b/examples/multimedia/shared/shared.pri diff --git a/examples/multimedia/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro index 17c850255..726ce2d3f 100644 --- a/examples/multimedia/spectrum/app/app.pro +++ b/examples/multimedia/spectrum/app/app.pro @@ -83,4 +83,4 @@ macx { QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN } } -include(../../../shared/shared.pri) +include(../../shared/shared.pri) diff --git a/examples/multimediawidgets/camera/camera.pro b/examples/multimediawidgets/camera/camera.pro index d4f8df5c4..52c511acb 100644 --- a/examples/multimediawidgets/camera/camera.pro +++ b/examples/multimediawidgets/camera/camera.pro @@ -25,4 +25,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/camera INSTALLS += target QT+=widgets -include(../../shared/shared.pri) +include(../../multimedia/shared/shared.pri) |