summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/declarative-camera
Commit message (Collapse)AuthorAgeFilesLines
* declarative-camera example: Hide video View button if none recordedMikko Hallamaa2024-04-231-1/+2
| | | | | | | | | | | | | | The View button was visible even when no video was recorded. This was due to the assumption that actualLocation would evaluate to false if empty (see QTBUG-63629). This patch fixes the evaluation by converting the url to string, and comparing to empty string. Fixes: QTBUG-121172 Pick-to: 6.7 6.5 Change-Id: I642b03b439f57002bc505c46ee0045dc7cdbe514 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* declarative-camera: do not load camera UI if permission is deniedTimur Pocheptsov2024-04-122-7/+26
| | | | | | | | | | | On iOS and macOS the system shows popup asking for permission only once, if permission was denied, it must be granted using 'System Settings', otherwise, the app is pretty useless (black screen/viewfinder and buttons). So we show a warning message instead. Fixes: QTBUG-120567 Change-Id: Ieedf1a27fea50d98c8028817a0e1e35c3db28e3f Reviewed-by: Doris Verria <doris.verria@qt.io>
* Specify startup size for declarative-camera exampleJøger Hansegård2024-04-081-0/+3
| | | | | | | | | | | | | The declarative-camera example starts as a very small window where the camera preview is not visible. This patch sets the initial size to a size that fits better on desktop. Amends: dce85c8bb916673a1fa67b993af2cbceadd0c884 Task-number: QTBUG-119350 Pick-to: 6.7 6.5 Change-Id: I1f6d0cfc267330041ab41630e3010db1e5f7da12 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Correct license for example and snippet filesLucie Gérard2024-03-261-1/+1
| | | | | | | | | | | | According to QUIP-18 [1], all example and snippet files should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I16a226b797329a9ce962732a97fd1af84ab22cda Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Fix zoom controls going off screen in QML camera exampleElias Hautala2024-03-184-9/+8
| | | | | | | | | | | Makes the declarative camera example use Window size as the basis for scaling instead of hard coded values. Fixes: QTBUG-119350 Pick-to: 6.7 6.7.0 Change-Id: I03782799591ed509e693e89d55780290b261eb14 Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Doc: Create separate 'Graphics', 'Multimedia' example categoriesJaishree Vyas2024-01-161-1/+1
| | | | | | | Fixes: QTBUG-117884 Pick-to: 6.6 6.7 Change-Id: Id718b09af348c042faa9fa72cf6295f731b7573d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Fix example file quoting and missing namespace documentationTopi Reinio2023-12-141-9/+11
| | | | | | | | | | | | | | | | | | | | Fixes the following documentation warnings: declarative-camera.qdoc:54: (qdoc) warning: Command '\printto' failed at end of file declarative-camera.qdoc:152: (qdoc) warning: Command '\printuntil' failed at end of file qvideo.cpp:8: (qdoc) warning: RotationAngle is documented, but namespace QVideo is not documented in any module. Mark the documentation project free of warnings. Pick-to: 6.7 6.6 Change-Id: I45153fa9f6ba29a9d636229ef0a0465916f0291f Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Assign anonymous functions to signal handlers that access parametersMikko Hallamaa2023-11-022-2/+2
| | | | | | | | | | | | | | | QML Camera had plain code signal handlers that access signal parameters. This brings up qmllint info messages because injecting parameters like this deprecated. These handlers are assigned arrow functions where the parameter is defined in the signature. Task-number: QTBUG-113682 Pick-to: 6.5 6.6 Change-Id: I6b4f5f3f966e525dbf554815a00e185bdb4f2f43 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
* Fix unqualified access to properties in QML Camera exampleMikko Hallamaa2023-11-018-111/+172
| | | | | | | | | | | | | | | | | | | | | | | | | The QML Camera example had plenty of qmllint warnings about unqualified access of properties. These are now qualified with the object IDs. Accesses using parent.property syntax are also replaced with id.property. For accessing properties of outer components from inner delegates, the "pragma ComponentBehavior: Bound" is added to the files qmllint warns about to ensure access. Additionally for delegate components that access data created for them dynamically, "required property" syntax is used to access them using id.property. Anchor bindings in AnchorChanges now use id.property syntax as well, but qmllint gives "incompatible-type" warnings regarding binding QQuickAnchorLine to QQmlScriptString. This is a qmllint issue, so for now the warnings are suppressed using qmllint disable comments. Task-number: QTBUG-113682 Task-number: QTBUG-101364 Pick-to: 6.5 6.6 Change-Id: I4e1f219d0fa7436b2a9da3389f792e8d1bd150d1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
* Refactor QML camera example "variant" type propertiesMikko Hallamaa2023-10-262-4/+4
| | | | | | | | | | | QML camera example had custom properties with deprecated "variant" type. These now have the type replaced with a narrower type or "var". Task-number: QTBUG-113682 Pick-to: 6.5 6.6 Change-Id: I8767dc740d2189a00a5def875ebb847e229008b1 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* Refactor QML Camera example orientation and control layout state logicMikko Hallamaa2023-10-242-26/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | In QML Camera example, the state of the photo/video controls that determines the layout those controls was updated by the setState function. This function was called on camera UI width change, and initially only because of stillControls.state being bound to the function. The videoControls.state was then bound to stillControls.state. This caused qmllint warnings (unqualified access to setState() and info message because setState() doesn't return a value) and log spamming whenever the window width changed. The orientation and control layout state logic is now encapsulated in a separate Item "controlLayout", and the stillControls and videoControls objects both bind to the state and buttonsWidth properties of this new Item. Additionally the message about state change is logged only when the state actually changes. Documentation is also updated to display the correct part of the code in the section that mentions the control layout. Task-number: QTBUG-113682 Pick-to: 6.5 6.6 Change-Id: I99e5c0c3d3bb369dd985cd06fdb51d687ef24f1f Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Fix issues causing runtime warnings in Qml Camera exampleMikko Hallamaa2023-10-232-2/+2
| | | | | | | | | | | | | | | | | | There were two runtime warnings that showed up when running and using the QML Camera example: "Too many arguments, ignoring 1" was caused by the "value" argument being passed when emitting the CameraPropertyPopup.selected() signal. "Error: Cannot assign [undefined] to QString" was caused by there being an unnecessary assignment of "state" when clicking "View" in photo controls. Task-number: QTBUG-113682 Pick-to: 6.5 6.6 Change-Id: I35e6ad4b27483b3009cb1b870e6709a175b26e27 Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* Update PropertyChanges syntax in QML Camera exampleMikko Hallamaa2023-10-193-56/+26
| | | | | | | | | | | | | | | | | | QML Camera example had PropertyChanges objects using the Qt5 way of providing a target and plain property names. This now causes the qmllint warning: "Property <property> is custom-parsed in PropertyChanges. You should phrase this binding as <id>.<property>: ... [Quick.property-changes-parsed]" The PropertyChanges objects in any single State are merged into one object that has all required property changes listed as: <id>.<property>: ... Task-number: QTBUG-113682 Pick-to: 6.5 6.6 Change-Id: Id69d52ecadbb3e67aa0d101e646b868d17b8046e Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* Remove unused imports in QML Camera exampleMikko Hallamaa2023-10-193-3/+0
| | | | | | | | | | | QML Camera example had unused QtMultimedia imports which are now removed. Task-number: QTBUG-113682 Pick-to: 6.5 6.6 Change-Id: I6e746115316c00c550193574e06e73eee9e7074e Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* Bind implicitHeight of Items in Layouts instead of heightMikko Hallamaa2023-10-192-4/+4
| | | | | | | | | | | | | | | | | In QML Camera example PhotoCaptureControls and VideoCaptureControls components there were bindings of the height property of Items which are managed by Layouts. These caused Quick.layout-positioning qmllint warnings. These are changed to bind implicitHeight instead since the width/height properties of Items should be managed by the parent Layout. Task-number: QTBUG-113682 Pick-to: 6.5 6.6 Change-Id: I5f28b2c8126a9cc7e9709e8497d87d565e519807 Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
* Example: Fix wrong positions of PopupsBartlomiej Moskal2023-09-192-0/+2
| | | | | | | | | | | | | | | | | | | | | Declarative-camera example handles Portrait and Landscape states. These states affect popup anchors: - when moving to "MobileLandscape" state, anchors.right was set to parent.left; - when moving to "MobilePortrait" state, anchors.right/anchors.left were not updated; Because of that, popups were moved out of the screen after changing states: Portrait->Landscape->Portrait. This commit sets correct horizontal anchor for Popup (for MobilePortrait state). Pick-to: 6.6 6.5 6.2 Fixes: QTBUG-114083 Change-Id: I1470c0ead3dbb5248bb77650519b5eef6f8eb6ff Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Update mobile example categories for Qt 6.6Rami Potinkara2023-09-111-0/+1
| | | | | | | | | | | | | Add mobile example category tags for chosen examples. For the ones that work best for both Android and iOS. Added, as verified on Android -QML Camera (declarative-camera) Fixes: QTBUG-116780 Pick-to: 6.6 Change-Id: I822cde0551856b982bcbf5a41bc855b493bb70ad Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Examples: Fix declarative-camera example built by qmakeBartlomiej Moskal2023-09-061-0/+1
| | | | | | | | | | | | | | FlashControl.qml file was added in 8a565b9e9c6a793042352542a9110daeaf8d7c82 commit. The new file was added to CMakeLists.txt, but it was not added to declarative-camera.qrc (used by qmake). This commit adds missing FlashControl.qml file to declarative-camera.qrc Pick-to: 6.6 Fixes: QTBUG-116451 Change-Id: I5ecc4b2295d04350fe1bd7618fa21408c662a985 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Docs: Add missing images to declarative-camera example documentationNicholas Bennett2023-08-222-0/+0
| | | | | | | | Added two missing images. Pick-to: 6.5 6.6 Change-Id: Ifb4b57110407b190190f235c7912dcde4f0250f0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Add \examplecategory for Qt MultimediaVenugopal Shivashankar2023-07-211-0/+1
| | | | | | | | | | | Categorized the examples based on the categories listed in https://wiki.qt.io/Qt6/Example-Guideline#Categorisation. Task-number: QTBUG-115301 Pick-to: 6.5 6.6 Change-Id: I44ff60e0400558c451a5f2ce5be246172341f734 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Example: Fix for ZoomControl in declarative-cameraBartlomiej Moskal2023-06-282-3/+3
| | | | | | | | | | | | | | | | | During the docs update 24422051dfacaa8036ba45ad23f449922540296b some changes in example implementation were done, that need to be fixed or reverted: 1. Height of ZoomControl should not be hard coded. That makes Zoom control incorrectly positioned. Bring back setup before docs update; 2. Update zoomTo signal parameter name (from "value" to "target"), as signal handling (onZoomTo) already uses new name; Pick-to: 6.6 6.5 Fixes: QTBUG-114659 Change-Id: I7da23d3f8ec913d5a078d10c89c4b185c62d1590 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Docs: Expand and update the QML Camera example documentationNicholas Bennett2023-06-067-17/+135
| | | | | | | | | | | | Added images, code snippets, and restructured the documentation to talk about the changes since the documentation was initially created. Fixes: QTBUG-113572 Pick-to: 6.5 6.6 Change-Id: I20d09c6a468404ed6f2a8aaabd695d8a92160d62 Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
* declarative-camera: Fit camera output to window on desktop as wellTor Arne Vestbø2023-06-011-5/+1
| | | | | | | | | | | | It's no different from the mobile modes. Pick-to: 6.5 Change-Id: I21a00b63b816e9a2e0b75f96e75007549a2cb8d0 Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
* Commonize popup behavior between camera settings and device listNicholas Bennett2023-05-301-0/+1
| | | | | | | | | | | | | | | Currently when you select a device in the in the device list popup it does not close the popup, unlike with the camera settings popup list This leads to some user-confusion regarding expected behavior of the example. I replicated the emission of the selected() signal as used in the camera settings popup to fix this. Pick-to: 6.5 6.2 Change-Id: I1ef5faf75dff702f61991b9ac1735364b187b10b Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no>
* Examples: extend declarative-camera with flash setupBartlomiej Moskal2023-05-244-0/+82
| | | | | | | | | | Extend declarative-camera example with the possibility of changing the flashlight. If the features are supported on device additional switches are visible on the screen for turning ON flashMode or torchMode. Fixes: QTBUG-113758 Change-Id: I321648a0bb2660cfaee173621f785ee908bf9025 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Adjust multimedia examples to use new QPermission APIIvan Solovev2023-02-081-6/+27
| | | | | | | | | | | | | | | | Now when the library itself does not request permissions, that needs to be done on the user application level. This patch updates all examples to query the required permissions. As there is no QML API yet, the QML examples do it directly from main. Note: the WRITE_EXTERNAL_STORAGE Android permission is not handled by this patch, because it's currently not supported by the QPermission API. Task-number: QTBUG-109965 Change-Id: Iaeb09f9e32fced0ecb0f5ffc63d40c64ec386cfb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix zoom factor setting in declarative camera exampleLars Knoll2022-10-091-1/+1
| | | | | | | | | Use the correct zoomFactor property. Task-number: QTBUG-105372 Change-Id: Ib462a87be5c28ba5489998ada8d9ea922568bd6c Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
* Examples: C++ style cleanupKai Köhne2022-09-071-5/+4
| | | | | | | | | | | | | Run clang-format on all files. Unify the headers to use the canonical include variants: single class includes instead of #include <QtGui>. Finally, using signals and slots instead of Q_SIGNALS and Q_SLOTS. Pick-to: 6.4 Change-Id: I033dad85a4a25600ec4e3171bede8b98e584cf5d Reviewed-by: Lars Knoll <lars@knoll.priv.no>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-231-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: Iaf0950f30b9332ec7f04113971bc58547e31a2b9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-071-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: If5c61e7ebea0452847d411ea230438095111e030 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-2414-663/+28
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: Ida08dfe6c84778656e942178c3d39042c9ef1ed2 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Split spatial audio out into a lib of its ownLars Knoll2022-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Move the classes from src/multimedia/spatial into its own QtSpatialAudio library. This is required to keep Qt Multimedia compatible with the requirements from the KDE Free Qt Foundation agreement, as well as to keep license compatibility with existing applications licensed under GPLv2 that are using Qt Multimedia. Moving the classes into a module of their own required a few additional changes to ensure we generate proper documentation for the new spatial audio module. To align the API between C++ and QML, the QML import was also renamed to QtQuick3D.SpatialAudio. Pick-to: 6.4 Change-Id: Ia3f9ac5e1edac4b1e07d3302d7a229ada5bdc038 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove old Digia organization identifier from example Info.plistsTor Arne Vestbø2022-06-021-1/+1
| | | | | | | | The PRODUCT_BUNDLE_IDENTIFIER variable already contains an appropriate value based on the organization and product name. Change-Id: I089582a95bedd00712c5a0994129a6c825d0d411 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Improve examples CMakeLists.txt (II)Kai Köhne2022-03-211-2/+1
| | | | | | | | | | | | - Remove double newline at the end - Use unversioned Qt commands - Remove QtC specific hacks Amends 236eec9cbe3 Pick-to: 6.3 Change-Id: Ia6dc5dc801a9002f9f5740869651c343b714913b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove the code-signing step from examplesDoris Verria2022-03-173-27/+0
| | | | | | | | | | | | Codesigning with entitlements is not needed unless the hardened-runtime option is enabled, so we can remove this post-build step. Fixes: QTBUG-101719 Pick-to: 6.3 6.2 6.2.4 Change-Id: I35181220dbe4ef6b59072dcd3e76f066ab85db60 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-02-171-14/+5
| | | | | | | | | | | | | | | | | - Remove "# generated from xyz.pro" comment from pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I9f60da23df1547d685439b0263fa5bf533b7c69e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Declarative-camera: improve camera selectorTasuku Suzuki2022-02-171-0/+1
| | | | | | | Camera list was shown outside of the popup Change-Id: Ib3b73b092293485271919668b5ce767b935601c4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Multimedia examples: Add camera and audio input entitlementsDoris Verria2021-12-173-0/+29
| | | | | | | | | | | | | | | Apple needs apps to specify proper entitlements in order to grant the executable permissions to use services like camera and microphone. The multimedia examples using microphone and camera were sometimes crashing because of missing entitlements. To fix, add an entitlement file to all examples using these services, and add a post-build command to codesign the executables with the specified entitlements. Task-number: QTBUG-98419 Pick-to: 6.3 6.2 Change-Id: I6a578def1f6a41b4d106ee49c0c32fad304ef3cb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix Declarative Camera issues on video sidePekka Gehör2021-12-142-3/+7
| | | | | | | | | After the fix, the buttons on video side will behave as they should and preview plays the video. Fixes: QTBUG-99134 Pick-to: 6.2 6.3 Change-Id: I593aad3f37b93b3699781c6b143e7e0c9a157ec3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Declarative-camera facelift for mobilePekka Gehör2021-11-225-84/+358
| | | | | | | | | After patch, you can use the camera in portrait and landscape mode on mobile devices. Task-number: QTBUG-96077 Change-Id: Idd46498e1166bab09a27d182ce707d8bb4528c24 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Fix the capture button issuePekka Gehör2021-09-131-1/+1
| | | | | | | | | The capture button does not works. Pick-to: 6.2 6.2.0 Fixes: QTBUG-96102 Change-Id: Iac7a774cd81113e55550598423e9c19bc775c9b3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove NSApplication from Info.plist filesDoris Verria2021-09-091-3/+0
| | | | | | | | | This causes the applciation to crash on iOS as this class doesn't exist there. Pick-to: 6.2.0 6.2 Change-Id: I393a63b2635475510f3fe1325d5c0cdace79f006 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Docs: Remove superfluous or incorrect contentNicholas Bennett2021-08-241-2/+1
| | | | | | | | | | | | Remove qmake information from widgets page. Move relevant information out of qml-multimedia.qdoc and remove. Fix incorrect reference to the obsolete QML audio type. Remove reference to qmake for widgets Task-number: QTBUG-94646 Pick-to: 6.2 Change-Id: If3fe045307dd2a39518408a55785496379428153 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix declarative-camera exampleLars Knoll2021-08-173-2/+6
| | | | | | | | | Adjust the example to MediaDevices API changes Pick-to: 6.2 Change-Id: Ie67016c9ff57cda5a1000099f553b76174c39513 Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-171-1/+1
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I67a136d4437269f9afea9bf71d424d46132f4fa4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Declarative-camera Example: Remove non-existent propertyDoris Verria2021-08-131-1/+0
| | | | | | Pick-to: 6.2 Change-Id: Ib863b1497c9b2714f22b81667c236afb6472af87 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Restore qmake project files for examplesJoerg Bornemann2021-08-061-0/+11
| | | | | | | | | | | | We regression-test in the CI by building examples with qmake. This partly reverts commit 7b28765dd0898e0638555e990308dc2fa09b79da. Pick-to: 6.2 Fixes: QTBUG-95065 Change-Id: Ib146eeb974d4e94d580597dbaae93378aa5561a9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Rename QMediaCaptureSession::encoder to recorderLars Knoll2021-07-082-8/+8
| | | | | | | | | | | | | As the class is called QMediaRecorder this is required for API consistency. Also cleaned up the front end code and examples where they used encoder instead of recorder. Cleanup of the backend will have to come in a separate change. Change-Id: I6e63e607473e68f628b1f89ffa3edcbc5bf5c2c8 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Rename QCamera::cameraInfo to cameraDeviceLars Knoll2021-06-162-2/+2
| | | | | | | | And take the opportunity to clean up variable naming as well. Change-Id: I510cc8295b8d35554534a3c2ac9d83bf6f5a9d65 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
* Use QAudioOutput in QMediaPlayerLars Knoll2021-06-111-0/+2
| | | | | | | | | | | | | | Adjust QMediaPlayer to the new audio output architecture. One now needs to explicitly add a QAudioOutput to the media player to get audio playback. While this requires two more lines of code to set up the media player, it does make the API consistent between audio and video and also consistent with what we have in QMediaCaptureSession. Adjusted auto tests where required and ported all platforms. Change-Id: I247e915e4862dee6d6bce367b83664b1d1d69726 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 21:21:30 +0000