From 6dda96f4d4681f7107931bea4c5a0f3fc35bec8d Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Tue, 7 Aug 2018 09:13:58 +0200
Subject: 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>
---
 examples/multimedia/audiodevices/audiodevices.pro  |  2 +-
 examples/multimedia/audioinput/audioinput.pro      |  2 +-
 .../multimedia/audiorecorder/audiorecorder.pro     |  2 +-
 .../declarative-camera/declarative-camera.pro      |  2 +-
 examples/multimedia/shared/shared.pri              | 48 ++++++++++++++++++++++
 examples/multimedia/spectrum/app/app.pro           |  2 +-
 6 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 examples/multimedia/shared/shared.pri

(limited to 'examples/multimedia')

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/multimedia/shared/shared.pri b/examples/multimedia/shared/shared.pri
new file mode 100644
index 000000000..26bdf73cf
--- /dev/null
+++ b/examples/multimedia/shared/shared.pri
@@ -0,0 +1,48 @@
+darwin {
+    INFOPLIST = \
+       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" \
+       "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" \
+       "<plist version=\"1.0\">" \
+       "<dict>" \
+        "    <key>CFBundleIconFile</key>" \
+        "    <string></string>" \
+        "    <key>CFBundlePackageType</key>" \
+        "    <string>APPL</string>" \
+        "    <key>CFBundleGetInfoString</key>" \
+        "    <string>Created by Qt/QMake</string>" \
+        "    <key>CFBundleSignature</key>" \
+        "    <string>????</string>" \
+        "    <key>CFBundleExecutable</key>" \
+        "    <string>$$TARGET</string>" \
+        "    <key>CFBundleIdentifier</key>" \
+        "    <string>com.digia.$${LITERAL_DOLLAR}{PRODUCT_NAME:rfc1034identifier}</string>" \
+        "    <key>CFBundleDisplayName</key>" \
+        "    <string>$${LITERAL_DOLLAR}{PRODUCT_NAME}</string>" \
+        "    <key>CFBundleName</key>" \
+        "    <string>$${LITERAL_DOLLAR}{PRODUCT_NAME}</string>" \
+        "    <key>CFBundleShortVersionString</key>" \
+        "    <string>1.0</string>" \
+        "    <key>CFBundleVersion</key>" \
+        "    <string>1.0</string>" \
+        "    <key>LSRequiresIPhoneOS</key>" \
+        "    <true/>" \
+        "    <key>UILaunchStoryboardName</key>" \
+        "    <string>LaunchScreen</string>" \
+        "    <key>UISupportedInterfaceOrientations</key>" \
+        "    <array>" \
+        "            <string>UIInterfaceOrientationPortrait</string>" \
+        "            <string>UIInterfaceOrientationPortraitUpsideDown</string>" \
+        "            <string>UIInterfaceOrientationLandscapeLeft</string>" \
+        "            <string>UIInterfaceOrientationLandscapeRight</string>" \
+        "    </array>" \
+        "    <key>NSCameraUsageDescription</key>" \
+        "    <string>Qt Multimedia Example</string>" \
+        "    <key>NSMicrophoneUsageDescription</key>" \
+        "    <string>Qt Multimedia Example</string>" \
+        "    <key>NOTE</key>" \
+        "    <string>This file was generated by Qt/QMake.</string>" \
+        "</dict>" \
+        "</plist>"
+    write_file($$OUT_PWD/Info.plist, INFOPLIST)|error()
+    QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist
+}
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)
-- 
cgit v1.2.3