aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml
Commit message (Collapse)AuthorAgeFilesLines
* Fix locale exampleFabian Kosmale2023-02-131-14/+15
| | | | | | | | | | | | | | Instead of fetching data from the view, we should rather fetch it from the model, which avoids a bug with casting when the currentItem is null. Use the opportunity to use a typed list for the model instead of a plain JS array. Original-patch-by: Kai Köhne <kai.koehne@qt.io> Change-Id: Ib23fb31b3d0a2c309c98bf762cea1a8c05080c38 Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 05683ad15d068b42b8b54d75a3c5377e994bface) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlExamples: Add missing dependencies of QtQuick in CMakeListsSemih Yavuz2022-11-0915-19/+25
| | | | | | | | | | | | | Running qmllint on extending-qml examples raises a plenty of warnings due to a missing dependency declaration to QtQuick. Simply add it. Also add FINAL to all properties exposed from C++ to disable (possible) property shadowings. Fixes: QTBUG-106602 Change-Id: I7b12a804f8f3ca64bd8f2f312a9e53dfe02b0a4c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 826cf9bb808999d9b49f8ad53b80a902e8fd7bda) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SEO-enhance attached property documentationFabian Kosmale2022-10-121-0/+6
| | | | | | | | | | | | | Currently, it's rather hard to find the documentation on how to write attached properties. The page that gets found first in most search engines seems to be the example - so link from it to the actual documentation pages. Change-Id: I78c9949d62863b5c11ffcd97413084ab03b0bc33 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 78beaa5ff81ac8b269bfd302d1770df87e29aaa4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Examples: Do not use import version numbers anymoreKai Köhne2022-08-3123-36/+36
| | | | | | | | | Change-Id: I1f4d4920bb9d132a846ac2dbcfdb8b660759d540 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit b7f448f8647a9a118cee2d79d446194b20d4b335) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: deploy qmldir for plugin exampleSamuli Piippo2022-08-311-0/+2
| | | | | | | | | We need to deploy qmldir to make the example work also for remote targets. Change-Id: Id0b7bf4a48bd163ddf5e44a5a68ca3edbbcc008e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b21290a731876d6c26546b48ab339d36cb873745) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use SPDX license identifiersLucie Gérard2022-06-14124-5938/+248
| | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 0dc4fd240a2897c5c443a0ef6d84c416843e4938) Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Examples: Replace qt-5 urlsKai Köhne2022-06-051-1/+1
| | | | | | Pick-to: 6.3 Change-Id: Ifec0960bfb3f179e2cf5ff5e7f11364b106a86e3 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: Rename snippet id to a unique identifierAndreas Eliasson2022-06-022-4/+3
| | | | | | | | | | The header file has two snippets with the same id. Rename to unique values and link to the correct snippet id from the qdoc file. Fixes: QTWEBSITE-1051 Pick-to: 6.3 Change-Id: I9003916f831898026f520fd86d60ab1c0230e6c4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix URI of i18n exampleUlf Hermann2022-06-021-1/+1
| | | | | | | | It shouldn't be "dynamicscene" as that URI is already used by a different example. Change-Id: I35ac6b7ea70703f24304f640252f922d6a5b2371 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Add CMake sections to 'Creating C++ Plugins for QML' pageAndreas Eliasson2022-05-042-7/+36
| | | | | | | | | | | | - Revise grammar - Fix so that example project can be built from the command line using CMake - Add tabs on example page Pick-to: 6.3 Task-number: QTBUG-102330 Change-Id: Ic6bdcadec66850f5e811dcaac23a8cb59a6c3f94 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Doc: Add CMake documentation to 'Extending QML' exampleAndreas Eliasson2022-04-252-6/+6
| | | | | | | | Fixes: QTBUG-102085 Pick-to: 6.3 Change-Id: I8f79a00b9ef827f229a94bc840b1951c8f67e4a2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qmldom: Fix standalone compilation against Qt 6.3.0Fawzi Mohamed2022-04-221-1/+1
| | | | | Change-Id: I402eeeab1cd6f5e02d5f49eedbd01010de39d05a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add VERBATIM option to add_custom_command callsAlexey Edelev2022-03-311-0/+1
| | | | | | | | | | | Use VERBATIM option to prepare the correct command line for the add_custom_command. This especially sensitive when using build directories with names containing special symbols, that cannot be handled by shell correctly. Change-Id: Ic6ea2a557fe4e7ccc1d2a0c5c4ab707223c0b91a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add cmake support for examplesFabian Kosmale2022-03-292-1/+48
| | | | | | | | | | | | | | qml-i18n needed to be ported to CMake first. It uses qt_add_translations introduced in 6.2 As a drive-by, move find_package calls from examples' CML to the top level CML, and make the QtSql dependency optional. Also make sure that we only add the dynamicscene example when the Quick target is available. Pick-to: 6.2 6.3 Fixes: QTBUG-90964 Change-Id: Id357eb14e4704753386e01393300966eb89b4e86 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-01-2427-222/+88
| | | | | | | | | | | | | | | | | | - Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for 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: I0d6bfb06c4b25e9921d3d2bf31d977150f12b31b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Rename "Basic Types" to "Value Types"Ulf Hermann2022-01-211-1/+1
| | | | | | | | | | Internally they've been called "value types" all along. Now that we are adding the ability to define your own value types the "basic" name is not really fitting anymore. Value types can be quite complex. Change-Id: I5fb4abec1dd2f0bbf7fb7f08b02db0882490e983 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-161-1/+1
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: I7fab73f63a22901ab2d4d4e57b5a25b433100de5 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* qmldom: load and rewrite exampleFawzi Mohamed2021-12-072-0/+583
| | | | | | | | load and rewrite example using the standalone build of the dom and compiler libraries Change-Id: Ib7823712aea2164291c21b07956dcec734bc9542 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Polish the QML reference examplesFriedemann Kleint2021-11-0453-474/+285
| | | | | | | | | | | | | - Use member initialization, which allows for using constructors from the base classes - Use qsizetype for indexes - Use qInfo() instead of qWarning() for printing - Add spaces/fix formatting Pick-to: 6.2 Change-Id: Iebce1b810ce00f29395207d93303363b3b71e52e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update examples to use new PropertyChangesUlf Hermann2021-11-031-3/+5
| | | | | | | | Also, prefer the multi-line syntax over ';'-separated bindings for readability. Change-Id: I3d6eb854e514ee257ca83773a11e6e9e10770bff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* doc: Replace qmlscene with qmlShawn Rutledge2021-09-291-2/+2
| | | | | | | | | | We deprecated qmlscene in a9c93e2716a097c637515aded49a3308e257204b so we should stop recommending it in docs, too. Task-number: QTBUG-53219 Pick-to: 6.2 Change-Id: Ic729624a8ef849bd13f38087e20b5a410c5c5756 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix dynamicscene example to use a QML moduleUlf Hermann2021-09-0417-66/+47
| | | | | | Pick-to: 6.2 Change-Id: I23b87b8ca98721cebc0dc948f0c9bbf741af6cd5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Simplify the XmlHttpRequest exampleOliver Eftevaag2021-09-037-213/+61
| | | | | | | | | | | | | | | | | The XmlHttpRequest example contains a lot of unnecessary code, and I felt that most of it could just be removed. The point of the example project is to showcase how to use the XMLHttpRequest javascript object to make requests. Which is why I felt that we could remove any outside dependencies for the project (like the LauncherList from the 'quick/shared' directory), and reduce the amount of components down to the minimum. Fixes: QTBUG-95734 Pick-to: 6.2 Change-Id: I9b062f4d7e942db4a2669a8c65f7488aa4a54740 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* CMake: qmake: Fix chapter6-plugins example to build in more configsAlexandru Croitor2021-08-313-30/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, I tested the following configurations / scenarios (1) shared Qt + qmake + macOS bundle -> works (2) shared Qt + CMake + macOS bundle -> broken (3) static Qt + qmake + macOS bundle -> broken (4) static Qt + CMake + macOS bundle -> works (2) was broken because the shared qml plugin is not located in the expected location (see below) (3) was broken because qmake needs a lot of error-prone boilerplate to ensure static qml plugin building and linking works. The change fixes the example to build and run successfully in case (2). Tested the following scenarios on macOS with the change shared Qt + qmake + macOS bundle -> works shared Qt + CMake + macOS bundle -> works shared Qt + qmake + no bundle -> works shared Qt + CMake + no bundle -> works static Qt + qmake -> still broken static Qt + CMake -> works To make shared qml plugins be found in a macOS bundle, we need to copy the qmldir and plugin under the bundle's PlugIns subfolder, because the application adds that as the expected qml import path for macOS. This basically mimics what the qmake project does with QMAKE_BUNDLE_DATA. The change also cleans up the CMake projects a bit so they don't link PUBLIC-ly against dependencies, install the plugin under a more sensible location and don't needlessly setup package finding and other boilerplate that's done in the parent project. The change also cleans up the qmake projects to adjust to not pollute the macos bundle dir with static plugin files. Amends 9e1d2a0eb15487f8f2acb4d91b281568897fb4e1 Pick-to: 6.2 Change-Id: I45bb699a67adf598587350a03f778291fad3f850 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix warnings/errors from changes to paths in chapter6-plugins exampleCraig Scott2021-08-311-2/+1
| | | | | | | Amends 2d2750efc3b5a97a5f1cf09b4265a26fcc393499 Change-Id: Iab27efb7359cfcea9274dcbbc7ac64b647d3e71b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Replace custom button component with QQC2 buttonsOliver Eftevaag2021-08-279-104/+85
| | | | | | | | | | | | | | | | | Now that we've moved qtquickcontrols2 into the qtdeclarative submodule. We want our examples to simply use qqc2 controls, rather than custom made buttons and other controls. This example used a custom made button component, which this patch will replace with qqc2. It will also use qqc2 in other places where it makes sense, like replacing a TextEdit with a qqc2 TextArea, and Text components with qqc2 Labels. Task-number: QTBUG-95733 Pick-to: 6.2 Change-Id: Ic733cd592cd10ef2cf45058aaf08a0f6b2f5bd2c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update qml examples for improved target path handlingCraig Scott2021-08-2432-416/+121
| | | | | | | | | | | | | Some examples were still using the old "add as ordinary resources" approach for QML modules, others needed adjustment to the subdirectory structure to better reflect the URI structure of the QML modules involved. Task-number: QTBUG-95144 Pick-to: 6.2 Change-Id: Ie3399410cf6df491eb1e7b4a589ca26c577d82a0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1722-22/+22
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I9f76b787533dad1c469fbb8c69df6c27b20a9aa3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Change the default of OUTPUT_DIRECTORY for qt6_add_qml_module()Craig Scott2021-07-203-2/+2
| | | | | | | | | | | | | | | | | | | | | | | The new default is now controlled via a new QT_QML_OUTPUT_DIRECTORY variable. If that isn't set, the fallback assumes the source directory structure follows the URI structure and uses ${CMAKE_CURRENT_BINARY_DIR} instead. This pattern means more projects will have working import paths for qmllint and possibly other tools out of the box. There should also be fewer cases where the OUTPUT_DIRECTORY option needs to be used in calls to qt6_add_qml_module(). The QT_QML_OUTPUT_DIRECTORY variable facilitates the scenario where QML modules might be distributed across different parts of the source directory hierarchy, but once collected under a common base point defined by QT_QML_OUTPUT_DIRECTORY, they form a coherent set of QML modules whose subdirectory structure below that base point follows their TARGET_PATH. Fixes: QTBUG-94164 Fixes: QTBUG-95081 Pick-to: 6.2 Change-Id: I82864c361a2b34f7f1484cdbda0d9b64b34b9950 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add missing "override" keywordsUlf Hermann2021-06-306-6/+6
| | | | | | | | Our examples should follow best practices. Change-Id: Ice90a818ae46e921b421e8d297806d8f7200294b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Do not call QGuiApplication::exec() on an instanceUlf Hermann2021-06-305-5/+5
| | | | | | | | It's a static method. It should be called statically. Change-Id: I15fc8948988b0a2c0a30f8699949e06c66d92fdf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Use nullptr rather than 0 for null pointersUlf Hermann2021-06-3010-10/+10
| | | | | | | Change-Id: I2921298ad2e04001bdee8824c56f01c203efb7d6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Refactor and update qml CMake APICraig Scott2021-06-042-28/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing CMake API for qml modules had a number of shortcomings. Refactor it to achieve the following: - Clearly separate public and internal aspects. - Re-use code from qtbase for adding plugins and module targets rather than reimplementing close variations. - Provide more robust and complete support for qmllint, qmlcachegen and automatic generation of qmldir files. - Reduce the steps needed for more common scenarios. - Encourage the use of separate backing library and plugin targets. - Automatically generate the plugin class .cpp file where possible. - Specify .qml files directly through qml-specific API elements rather than assuming they can be extracted out of a set of resources. [ChangeLog][QtQml] The qml CMake API has changed from 6.1 and is now out of Technical Preview status. The most notable change is that .qml files should no longer be specified as resources, there is dedicated handling for them in the qt6_add_qml_module(). A related change is that the qt6_target_qml_files() command has been replaced by qt6_target_qml_sources(). More complete integration with qmlcachegen, qmllint and qmldir generation is also part of the CMake API. Fixes: QTBUG-91621 Task-number: QTBUG-82598 Task-number: QTBUG-88763 Task-number: QTBUG-89274 Task-number: QTBUG-91444 Change-Id: I25aae1b0e89890394dfe2ba2824008164b2ca8d9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Switch examples to build as isolated sub-buildsCraig Scott2021-05-273-21/+21
| | | | | | | Task-number: QTBUG-90820 Change-Id: Id9157526898ba72cb64ee8256639b37357f7bacf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-211-44/+11
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: If6e1033642d98ccd40daeb57a453c0e5bc2985da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* examples/qml/locale: Use inline component as a delegateMaximilian Goldstein2021-05-191-11/+17
| | | | | | | | Modernize the code by using an inline component as a delegate in this example file instead of declaring the delegate inline. Change-Id: I52c75f81c42362f858f63bdbbaf432c0966309fe Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Use functions as signal handlers when accessing parametersUlf Hermann2021-02-121-3/+3
| | | | | | | | | Injected signal handlers are bad practice because they aren't declared. Pick-to: 6.1 Task-number: QTBUG-89943 Change-Id: I3a691f68342a199bd63034637aa7ed438e3a037b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmlfunctions.qdoc: Add clarification to QML_FOREIGNMaximilian Goldstein2020-11-231-0/+4
| | | | | | | Fixes: QTBUG-87150 Pick-to: 5.15 6.0 Change-Id: If99a06a07892bdfef7b6b1e8fa737480750992fe Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQmlListProperty: Use qsizetype rather than int for sizesUlf Hermann2020-11-092-12/+12
| | | | | | | | | | [ChangeLog][QtQml] The QQmlListProperty callback functions use qsizetype now as type for the size of a list. This is in line with the containers that you might use to back the list. Fixes: QTBUG-88269 Change-Id: Ia38403cb32f241e6c70e1a580dbeff1d6d694331 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Regenerate examples to set the WIN32_EXECUTABLE propertyAlexandru Croitor2020-10-2623-0/+104
| | | | | | | | | As well as the MACOSX_BUNDLE properties as necessary. Task-number: QTBUG-87664 Task-number: QTBUG-86827 Change-Id: I46769fb543acb2cbeba122470b5e44ad478fbe4e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate examples to use qt_add_executableAlexandru Croitor2020-10-2021-21/+21
| | | | | | Task-number: QTBUG-87661 Change-Id: Ie5bba408000211b24694aa0143bdf79c4a298f42 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Fix lineedit exampleUlf Hermann2020-10-051-1/+1
| | | | | | | | | | The default name created by QML_ELEMENT is the name of the local type, not the one of the foreign type. Pick-to: 5.15 Task-number: QTBUG-87150 Change-Id: I2b5dfcea3e835d4e69d5fa4df179333a37ee1d6e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove use of deprecated High-DPI application attributesTor Arne Vestbø2020-09-021-1/+0
| | | | | Change-Id: Ibfb50fdcbb51ba93d6e5d11f9e8ce0e7b3bfde79 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Example: Pass QDate, QTime by value, not by const referenceEdward Welbourne2020-09-018-11/+11
| | | | | | | They're value types, packaging qint64 and int, repsectively. Change-Id: Icf18794466cd140e1384d6dd0de736fbb2c05a48 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Fix minor typosSze Howe Koh2020-08-301-1/+1
| | | | | | Pick-to: 5.15 Change-Id: I4c51c40697e410d56b6a2d2446ed9f8ae218576d Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
* Use QList instead of QVectorJarek Kobus2020-06-251-2/+2
| | | | | | Task-number: QTBUG-84469 Change-Id: I4c3353c00a566023503fbc178ba8454391dc334c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Examples: Fix double installation of .qml filesKai Koehne2020-06-025-25/+5
| | | | | | | | | | qt_example_installs.prf already generates install rules for all example sources, including content of .qrc files. Pick-to: 5.15 Fixes: QTBUG-84301 Change-Id: I3454b19849af489c5819c51867781cc97f1eb285 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Don't install .qmltypes for Qt tests, examples and toolsAlexandru Croitor2020-05-2918-18/+0
| | | | | | | | | | | that don't have an explicit QT_QML_MODULE_INSTALL_DIR path specified. We don't want to pollute the Qt qml import path with these files. Task-number: QTBUG-84403 Change-Id: I768267e0e79daa8090d882c301648cce14e1a809 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate qtdeclarative/examplesAlexandru Croitor2020-05-2923-23/+116
| | | | | | | | | Includes - new example installation paths - one case of QT_QMLTYPES_FILENAME addition Change-Id: I24423da9b04b6ecc8445017fa35f148dd43b1829 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-1232-25/+229
|\ | | | | | | | | | | | | | | Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641