From 4ff9a1bf81212a094f76a14ff1dc88a791d3ca6c Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Wed, 2 Nov 2016 14:05:11 +0100 Subject: iOS: add NSCameraUsageDescription to Info.plist for qmlvideofx The 'NSCameraUsageDescription' key is needed for the app to have access to the camera. Change-Id: I8b98247993edd450772e5393551e4acb07dcf0a0 Reviewed-by: Yoann Lopes --- examples/multimedia/video/qmlvideofx/Info.plist | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples') diff --git a/examples/multimedia/video/qmlvideofx/Info.plist b/examples/multimedia/video/qmlvideofx/Info.plist index 8fc242516..5fbe35f1c 100644 --- a/examples/multimedia/video/qmlvideofx/Info.plist +++ b/examples/multimedia/video/qmlvideofx/Info.plist @@ -26,5 +26,7 @@ 1.0 CFBundleVersion 1.0 + NSCameraUsageDescription + Qt Multimedia Example -- cgit v1.2.3 From 75b4283fb05d07fb8654e031f266e9918f1ae647 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Wed, 2 Nov 2016 14:13:17 +0100 Subject: iOS: add Info.plist to declarative-camera example It contains 'NSCameraUsageDescription', which is needed for the app to have access to the camera. Change-Id: I9843524f8eff84450156dfa7a9d6000c19c8ff8d Reviewed-by: Yoann Lopes --- examples/multimedia/declarative-camera/Info.plist | 41 ++++++++++++++++++++++ .../declarative-camera/declarative-camera.pro | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 examples/multimedia/declarative-camera/Info.plist (limited to 'examples') diff --git a/examples/multimedia/declarative-camera/Info.plist b/examples/multimedia/declarative-camera/Info.plist new file mode 100644 index 000000000..462df2ae0 --- /dev/null +++ b/examples/multimedia/declarative-camera/Info.plist @@ -0,0 +1,41 @@ + + + + + CFBundleIconFile + + CFBundlePackageType + APPL + CFBundleGetInfoString + Created by Qt/QMake + CFBundleSignature + ???? + CFBundleExecutable + declarative-camera + CFBundleIdentifier + com.qt-company.${PRODUCT_NAME:rfc1034identifier} + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleName + ${PRODUCT_NAME} + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + NOTE + This file was generated by Qt/QMake. + NSCameraUsageDescription + Qt Multimedia Example + + diff --git a/examples/multimedia/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro index 71d4f68b0..f0345f1e5 100644 --- a/examples/multimedia/declarative-camera/declarative-camera.pro +++ b/examples/multimedia/declarative-camera/declarative-camera.pro @@ -6,6 +6,8 @@ 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 -- cgit v1.2.3 From f0ea26416a73e9ed60e0e0440275e73081f601a2 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 26 Oct 2016 16:15:20 +0200 Subject: Move qtmultimedia over to the new config system Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen Reviewed-by: Yoann Lopes --- examples/multimedia/multimedia.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro index 449cb150f..0a01439c4 100644 --- a/examples/multimedia/multimedia.pro +++ b/examples/multimedia/multimedia.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += multimedia-private SUBDIRS += audiodecoder @@ -20,5 +21,5 @@ qtHaveModule(quick) { video } -config_openal: SUBDIRS += audioengine +qtConfig(openal): SUBDIRS += audioengine -- cgit v1.2.3 From a7c23d86362efad27b8dbfd1bc570299dd606fbb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 31 Oct 2016 10:14:14 +0100 Subject: Cleanup all maemo/meego specific code Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a Reviewed-by: Yoann Lopes --- examples/multimediawidgets/player/player.cpp | 12 ------------ examples/multimediawidgets/player/player.h | 4 ---- examples/multimediawidgets/player/player.pro | 4 ---- 3 files changed, 20 deletions(-) (limited to 'examples') diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index e787aa269..ab048838a 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -55,9 +55,7 @@ Player::Player(QWidget *parent) , videoWidget(0) , coverLabel(0) , slider(0) -#ifndef PLAYER_NO_COLOROPTIONS , colorDialog(0) -#endif { //! [create-objs] player = new QMediaPlayer(this); @@ -135,11 +133,9 @@ Player::Player(QWidget *parent) fullScreenButton = new QPushButton(tr("FullScreen"), this); fullScreenButton->setCheckable(true); -#ifndef PLAYER_NO_COLOROPTIONS colorButton = new QPushButton(tr("Color Options..."), this); colorButton->setEnabled(false); connect(colorButton, SIGNAL(clicked()), this, SLOT(showColorDialog())); -#endif QBoxLayout *displayLayout = new QHBoxLayout; displayLayout->addWidget(videoWidget, 2); @@ -152,9 +148,7 @@ Player::Player(QWidget *parent) controlLayout->addWidget(controls); controlLayout->addStretch(1); controlLayout->addWidget(fullScreenButton); -#ifndef PLAYER_NO_COLOROPTIONS controlLayout->addWidget(colorButton); -#endif QBoxLayout *layout = new QVBoxLayout; layout->addLayout(displayLayout); @@ -175,9 +169,7 @@ Player::Player(QWidget *parent) controls->setEnabled(false); playlistView->setEnabled(false); openButton->setEnabled(false); -#ifndef PLAYER_NO_COLOROPTIONS colorButton->setEnabled(false); -#endif fullScreenButton->setEnabled(false); } @@ -347,9 +339,7 @@ void Player::videoAvailableChanged(bool available) if (fullScreenButton->isChecked()) videoWidget->setFullScreen(true); } -#ifndef PLAYER_NO_COLOROPTIONS colorButton->setEnabled(available); -#endif } void Player::setTrackInfo(const QString &info) @@ -389,7 +379,6 @@ void Player::updateDurationInfo(qint64 currentInfo) labelDuration->setText(tStr); } -#ifndef PLAYER_NO_COLOROPTIONS void Player::showColorDialog() { if (!colorDialog) { @@ -434,4 +423,3 @@ void Player::showColorDialog() } colorDialog->show(); } -#endif diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h index 7f5d0881b..ca643bd7d 100644 --- a/examples/multimediawidgets/player/player.h +++ b/examples/multimediawidgets/player/player.h @@ -94,9 +94,7 @@ private slots: void displayErrorMessage(); -#ifndef PLAYER_NO_COLOROPTIONS void showColorDialog(); -#endif private: void setTrackInfo(const QString &info); @@ -111,10 +109,8 @@ private: QSlider *slider; QLabel *labelDuration; QPushButton *fullScreenButton; -#ifndef PLAYER_NO_COLOROPTIONS QPushButton *colorButton; QDialog *colorDialog; -#endif QLabel *labelHistogram; HistogramWidget *histogram; diff --git a/examples/multimediawidgets/player/player.pro b/examples/multimediawidgets/player/player.pro index 067b31b11..0c5be6888 100644 --- a/examples/multimediawidgets/player/player.pro +++ b/examples/multimediawidgets/player/player.pro @@ -20,9 +20,5 @@ SOURCES = main.cpp \ videowidget.cpp \ histogramwidget.cpp -maemo* { - DEFINES += PLAYER_NO_COLOROPTIONS -} - target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/player INSTALLS += target -- cgit v1.2.3