aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qtdeclarative6.2.0Qt Submodule Update Bot2021-10-041-4/+4
| | | | | Change-Id: Icb4260ed74a1c9c44e367345cd7b12f468c469ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-021-1/+1
| | | | | | | | Current value should be empty to reflect the branch status. Pick-to: 6.2 Change-Id: Ieafa1a1dea89f18c6953e146c1c61c892926faae Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2.0' in qt/qtdeclarativev6.2.0Qt Submodule Update Bot2021-09-241-4/+4
| | | | | Change-Id: I3017fd042b798db8d1146912ab45a97851ce335e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Repair broken links to the TextMetrics Qml typeLuca Di Sera2021-09-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FontMetrics` Qml type documentation links to the tighly related `TextMetrics` Qml type. The links were spelled as pointing to instantiating class `QQuickTextmetrics` instead of the Qml type `TextMetrics` in `QtQuick`, resulting in a link to a non-existing page. The relevant links were updated to point to `QtQuick::TextMetrics` resolving the linking issue. Furthermore, all the links were of the form `\l{link to some property X of TextMetrics}{...} property of \l {link the same property X}{TextMetrics}`. The second link in the pattern points to the same property as the link right before it but shows a link-text that expresses that it should point to the page of the whole type. Both to adjust the latter links and to simplify them, the pattern was changed to `\l{link to some property X of TextMetrics}{...} property of TextMetrics`, leaving the second link in the hand of QDoc's autolinker. Task-number: QTBUG-96127 Change-Id: I0e5c325d55193baa5a6bc3c6fae021d41fb32f3f Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 5eee691d93e06563a591c63c2fae3513e2493eb7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtdeclarativeQt Submodule Update Bot2021-09-231-4/+4
| | | | | Change-Id: I9710da4da98119352ab798c79d740a5749cb8604 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Update link to RFC-3986Luca Di Sera2021-09-221-1/+1
| | | | | | | | | | | | | | | | | | | The old `tools.ietf.org/html/*` web pages containing RFCs now redirect to `datatracker.ietf.org/doc/html/*`. While the redirection work, our script to catch broken links on dev-snapshots builds of the documentation doesn't handle redirection correctly, reporting it as broken. Both to appease the broken-links script and to avoid an unneccesary redirection the RFC link in `basictypes.qdoc` was modified to point to the new address. Task-number: QTBUG-96127 Change-Id: I74351ca0debe11522a9145b7e5c55070bfe86fc4 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 48ded70250ea92572a8d1a46e52a89ef9fd8e3fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtdeclarativeQt Submodule Update Bot2021-09-221-4/+4
| | | | | Change-Id: I76a14d5aaed46393a3260f5a4f40692ecca30ca2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtdeclarativev6.2.0-rc2Qt Submodule Update Bot2021-09-211-4/+4
| | | | | Change-Id: Idc85c4852a804d7ac72a357baf90da91eb9bcb7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix broken link in qmllint documentationKai Köhne2021-09-201-1/+1
| | | | | | | | | | \sa does expect a link target, no additional \l{} Change-Id: I672437a50bbe46f82d60e32addd4a9617cb60079 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 170f2135b03f6d48c7386e708b407084a51478be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8f86eb09a893601ad19577bda2dbc5524d45b399)
* Update dependencies on '6.2.0' in qt/qtdeclarativeQt Submodule Update Bot2021-09-191-4/+4
| | | | | Change-Id: I7a0c267339abef0fb29150b492c87501bbf82aac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix qdoc syntax errors in qml-changes-qt6.htmlKai Köhne2021-09-171-2/+2
| | | | | | | Change-Id: I04ca5a2a625e414522a46a0f1501d7ae8d610c6b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit c73f6ee9c793df85bfd4fdf0f2bf2b1f1ac6bfbb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Highlight text editor example in creatorOliver Eftevaag2021-09-141-1/+2
| | | | | | | | | Adding the text editor as a highlighted example in the qt creator welcome page. Pick-to: 6.2 dev Change-Id: I17bbc6effea53ff9b917ce3b03954e2808813b95 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on '6.2.0' in qt/qtdeclarativev6.2.0-rc1Qt Submodule Update Bot2021-09-131-4/+4
| | | | | Change-Id: Iedcd140617ffb93dfa9a44593532ec1c272cf707 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix incorrect \quotefromfile pathsTopi Reinio2021-09-131-2/+2
| | | | | | | | | | These files were renamed or moved around. Task-number: QTBUG-96125 Change-Id: I7ceefdec83f38477e48cf762bce34235d3f84b6d Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 42c13ae5ff93ce4c7c49ce32425b53d6a463a6d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtdeclarativeQt Submodule Update Bot2021-09-111-4/+4
| | | | | Change-Id: I82d8baa43ef5e1d5b5e272f9a0d9266fdcd89490 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtdeclarativeQt Submodule Update Bot2021-09-111-4/+4
| | | | | Change-Id: I21efa3c66fcd7636c1c176d79e70e929a12c6e8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* correctly export qQmlResolveImportPaths()Fawzi Mohamed2021-09-101-1/+3
| | | | | | | Change-Id: I5d7aa6ed56d95020a831ca466c9c021dc86c775e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit d2aaca797d3651a2c286f000794ca05f6cd9184c) Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* Fix warnings/errors from changes to paths in chapter6-plugins exampleCraig Scott2021-09-102-8/+5
| | | | | | | | | Amends 2d2750efc3b5a97a5f1cf09b4265a26fcc393499 Change-Id: Iab27efb7359cfcea9274dcbbc7ac64b647d3e71b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 784af37650a77b30de01776262c1fe6727075615) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Document chnaged behavior of url propertiesUlf Hermann2021-09-101-25/+5
| | | | | | | | Task-number: QTBUG-95587 Change-Id: I5f465bd37673d3a2e592def50550aacef9e060cd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit bd1a62be001523602abaebfd6afb45ae15cfa871) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtdeclarativeQt Submodule Update Bot2021-09-101-4/+4
| | | | | Change-Id: I01a9076c4fa9c3f2c4a438b07484dfb7a313d4f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtdeclarativeQt Submodule Update Bot2021-09-091-4/+4
| | | | | Change-Id: I9fc155f73cab64aa5f8a062a29eac7053cd64280 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix generation of names in qmldir filesUlf Hermann2021-09-096-2/+31
| | | | | | | | | | | | | | | | | Dots in QML module names are useless because you cannot instantiate a component with a dot in its name. We might as well strip all the extensions when adding components to a qmldir file. This takes care of .ui.qml as well. Furthermore, JavaScript files must not be listed because they cannot be instantiated as QML components. Change-Id: I9782420ea79fef1d5eedef97cf7a748b96ddbe2b Fixes: QTBUG-96301 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Tapani Mattila <tapani.mattila@qt.io> (cherry picked from commit 14a3b34906be5b749ebc6b6c1d8f6807fff8fd88) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Use modified target name as base name for internal qml pluginsAlexandru Croitor2021-09-0817-35/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using only the last dot component of the URI as the plugin base name causes issues when an app that uses QtQuickControls2 is macdeployqt'ed. The qqc2 impl plugins all have "impl" as the last URI component and thus they all use "impl" as the base name. macdeployqt tries to copy all of the plugins into a flattened PlugIns/quick folder, which ends up copying only one of the files. User qml plugins use the plugin target name as the plugin base name and plugin file name on-disk. There shouldn't be a reason for internal qml plugins to deviate too much from that. Adjust the internal qml plugin name to use the plugin target name with "plugin" suffixed at the end, but make sure to remove any existing "plugin" from the target name if it already exists, so we don't end up with double "plugin" in the base name. Amends a25f650c317e4886007a8beb0e9f2f7e973e6e7c Task-number: QTBUG-95140 Task-number: QTBUG-96261 Change-Id: If6096e88bf2da3de081d68fad2e70cef5a0b18af Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 658a911f9c8789418710bcbd9513774de89cb082) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add button argument to the TapHandler.[single|double|]tapped signalsShawn Rutledge2021-09-085-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | | It would be better to emit the whole pointer event (by pointer because it's non-copyable, or make it copyable and emit by value), but we can't. So we just add the button being tapped; more information is available from the eventpoint argument and TapHandler's point property. To avoid name clashes with anything that's already called "button" in anyone's QML (which is quite likely, actually), the new signal argument is unnamed, so that users will be required to write a function signature that gives it a name rather than relying on context injection. [ChangeLog][QtQuick][Event Handlers] TapHandler's tapped(), singleTapped() and doubleTapped() signals now have two arguments: the QEventPoint instance, and the button being tapped. If you need it, you should write an explicit function for the signal handler: onTapped: function(point, button) { ... } or onDoubleTapped: (point, button)=> ... Fixes: QTBUG-91350 Task-number: QTBUG-64847 Change-Id: I6d25300cbfceb56f27452eac4b29b66bd1b2a41a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 5864644ac8bc3c561696ffef5d033b1cab7d950f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add all qml debug translation fixes and functionalities from 5.15Tuomo Pelkonen2021-09-087-25/+72
| | | | | | | | | | | | | | | * Add current state name in the protocol * Get style name in correct format * Get correct root item after changing new file Task-number: QTBUG-96052 Change-Id: I5a7b9e29ec83e6258505cedbd55edf376386f783 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 1a85f784132f83211de431193d72cdf1e850f778) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c02f52fc452c1488c56453f1e9709968be33948f) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-09-081-4/+4
| | | | | Change-Id: I8933e539d4724e995745f75d6f525f403352a85d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix implicit size of TextAreaJan Arve Sæther2021-09-072-7/+4
| | | | | | | | | | | | | | An empty TextArea had a too large size because its placeholder item was too big. This follows a similar pattern as the former fix for TextField (5d8e74ab89b5ae465aefab924f4f14db59328a50) TextArea::test_ImplicitSize demonstrated this bug Task-number: QTBUG-95679 Change-Id: I2b71208a02e47a0a072326a6d600cbac90862ea7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit abf96ed452578d619a89982fc5fe233239768a71) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickGrid: Warn if there are more items than rows*columnsAlbert Astals Cid2021-09-072-1/+7
| | | | | | | Change-Id: I701d86079f2ddfb73b0470de97a2d1bff648166c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit a4a80db180540917e3077a2e22c71548f14fd8b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Examples: Fix top level buildFabian Kosmale2021-09-071-0/+1
| | | | | | | | | | | | | | Examples using the "shared" pattern need to be recorded in the list in examples/quick/CMakeLists.txt, so that we do the necessary AUTOMOC handling for them in a top level build. For details, see the commit which introduced that list. Amends 34bc389543c37b8439c9c0b48f471649b6529868. Change-Id: I6945b0c8445fe436da259dd240342e1c3b5cbf26 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Craig Scott <craig.scott@qt.io> (cherry picked from commit 011ee2dfec6b994430b9464f6c74d1c7246d508a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Improve QML WheelEvent docsShawn Rutledge2021-09-071-18/+32
| | | | | | | | | | The phrase "wheel degrees" was especially inaccurate; everything else here is a drive-by. Change-Id: Idb1a23cc7c1849df18c3c1f401c66a0fbfbdb929 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit e27bc63960ba8f81c6acd4c2375664a8012e58b2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix memory leak in Qt Quick Controls iconEirik Aavitsland2021-09-072-0/+8
| | | | | | | | | | | | The implementation of the icon property uses the internal QThemeIconInfo struct from qtbase. That is low level and expects the user to handle memory deallocation, and this was missing. Fixes: QTBUG-93050 Change-Id: Ied6488aa8871c246d3781a3db47f40130dc19bcc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 47ded88e0c2f489e112b72f62151123db5c04dbe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmldom: DomItem::makeCopy also for elements of the universeFawzi Mohamed2021-09-073-32/+58
| | | | | | | | | | | The universe is the cache where loaded files are stored, so to compare them immediately after load it is useful that the makeCopy method which creates a deep copy, works also on files in the files without environment. Change-Id: I35fc5a769b422d367d07af3374566997dd6b0153 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 42aa1d510214bb51f35c9ab0c798e39558d341cb)
* qmldom: improve path and addError performanceFawzi Mohamed2021-09-075-27/+90
| | | | | | | | | | | * avoid copy in Path::component(i) * find duplicate errors via map insert (log() comparisons vs n) Change-Id: Ib664615187fada810427665d161a0c3cabace1cf Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 3b19b9a9e67cae723496fadf97f91661596d6d33)
* Clean up the painteditem exampleUlf Hermann2021-09-0714-85/+152
| | | | | | | | | | | | The way it was before it was unusable. Move the files that belong to the TextBalloon module into their own directory, and add a wrapper application that loads textballoons.qml with the right parameters to actually find the TextBalloon module. Make sure that the qmldir file is copied to the output directory. Change-Id: Ie7407a425a0a95a46de6486f9a28fd1aee07de9f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 79cae5f6522bc259caa27b98031bfe84ef936744)
* Avoid to build the debug executable of qmlcachegen in multi-config buildLi Xinwei2021-09-071-2/+10
| | | | | | | | | | | Use $<COMMAND_CONFIG:${qmlcachegen}> to force the qmlcachegen command to rely on the release executable in multi-config build. Fixes: QTBUG-88414 Change-Id: I100f832fc70b63a235d2638dde04583c60fd8250 Reviewed-by: Craig Scott <craig.scott@qt.io> (cherry picked from commit 97b1062674283afb0131e73d8319c95aa7087a8b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Allow type conversions in storeNameSloppy()Ulf Hermann2021-09-071-2/+13
| | | | | | | | | | | That's part of the sloppiness. We have no way of retrieving the lookup metatype here. Task-number: QTBUG-96144 Change-Id: Ibd1c0d8e9bb66bfe66e59fd1368f3f8ac663d01c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit fb37577559fe524f010625302cf236609918d445) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check setter == setLookup when retrieving lookup metatypeUlf Hermann2021-09-071-1/+2
| | | | | | | | | | | We want the same init/apply mechanics to also work with setObjectLookup, and for that we need lookupResultMetaType to do the same thing there. Task-number: QTBUG-96144 Change-Id: I410101b7f13e60c0c2ed156a8cf5813c490d7bf0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit eff007aef95bfb71618ad3a7bd00481e5197c0f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix top level builds failing with AUTOMOC-related missing moc exeCraig Scott2021-09-072-1/+8
| | | | | | | | | | | | | | | | | | | | | In top level builds, qt_autogen_tools() needs to be called on any target that enables AUTOMOC. A previous commit fixed that problem for the qt_target_qml_sources_example target, but missed also fixing it for the associated plugin target. Add that missed call here. More examples that use the common "shared" quick directory have also since been added, but the step that ensures qt_autogen_tools() was missed. Add them to the missing step. One of the existing steps also had a typo, which meant it wasn't handled either, so correct that as well. Amends 067253fb2f1aec3e03c577dd53ed2e6d903c28da Task-number: QTBUG-96118 Task-number: QTBUG-96159 Pick-to: dev Change-Id: I2fae5d9a1fd474b22e01ec51d5b1030237f3e08f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-09-071-4/+4
| | | | | Change-Id: I8ba2a575656330fe39972eb40b57b4b13b84d762 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix layouts example to use a QML moduleOliver Eftevaag2021-09-062-28/+17
| | | | | | | | | Changing the CMakeLists.txt file to use qt_add_qml_module(). Change-Id: Icafe9359494136af6d5f3befaa9e767ab12deb30 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 2cd4391ba0c214d26ebf9298a0130b17c588a8c2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Correct the type that WheelHandler's wheel signal emitsShawn Rutledge2021-09-061-1/+1
| | | | | | | | | | It's WheelEvent not PointerScrollEvent. Task-number: QTBUG-81302 Change-Id: Ie03fbf60492525301ee8d60a0c38c8a111251e0a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit e2e7a1c5b81e4e7464134b4590aea799b0434d55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make TextField.implicitWidth fixedJan Arve Sæther2021-09-063-19/+14
| | | | | | | | | | | | | | | | | | | | | | | Previously, implicitWidth was based on contentSize() (which was based on the full textwidth inside the TextField) This had the unfortunate consequence that an empty TextField (which is very normal) was very narrow on startup (18 pixels on macOS style), but would grow wider as the user kept on typing. When the TextField was in a layout, this would in addition lead to a relayout, even though it usually was barely noticeable. This change aligns that behavior to the other non-native styles. This also fixes a test on native style windows: TextField::test_implicitWidth where it assumes that the implicitWidth of TextField without a background is simply equal to left+right padding. This failed because the calculation of the geometry of the placeholder item was wrong. Task-number: QTBUG-95679 Change-Id: Ie658411664d88df6cb6a337376bdcf897e8c1790 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit e0990f8b4069ca912de5a27df00a8039aa4a4731) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use value type providers in metaTypeFromJSUlf Hermann2021-09-062-19/+35
| | | | | | | Task-number: QTBUG-96144 Change-Id: If12f669ae33bb8ae4768ca79e4ca985f70a2651d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 9d9df8073dcee685ce47074e93022e3e2b75b2b8)
* Fix positioners example to use a QML moduleOliver Eftevaag2021-09-064-61/+28
| | | | | | | | | | | | | | This fix changes the CMakeLists.txt file to use qt_add_qml_module(). It also updates copyright headers and changes import statements to remove version numbers. This causes the example to use qt quick controls 2, rather than qt quick controls 1, which is obsolete, and should no longer be used by any of our examples. Change-Id: I1e40990b3a184c73b67a2ab04b4ec555774b8a1b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 06e96fdcdeee76fc65569cb64e5da26850b19c00) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix broken doc link to Qt Quick DesignerCraig Scott2021-09-061-2/+2
| | | | | | | | | | No link is needed and other documentation doesn't link to anything for the same thing. Change-Id: I4d1dc910d8114bc99478c59882e8c1cf8327c415 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit aeb1d11f26c204e71e0c2f6c3c1b521bb59bba7d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add "As" function to symbol tableUlf Hermann2021-09-063-0/+29
| | | | | | | | Fixes: QTBUG-96099 Change-Id: I0bc50c0a66759c36dc50b2d6ef8e16be8fbba45c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2426b622e1852a418e97a3be89ea1b3eb18b8fb9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmldom: pass optional fileType to loadFileFawzi Mohamed2021-09-065-96/+120
| | | | | | | | | | | | | | If filetype is given use it to specify the type of the file to load (otherwise guess it from the file extension). Can be used to load qmltypes files as "plain" qml files (for reformatting). Ths enables the reformatting of .qmltypes (for API comparison) Change-Id: Ib65647c2a8dc8b37b7e955acb3aec2193d36666d Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 7331f651c1c16217a31f3cdec700f014057b7268) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add documentation for qt_import_qml_plugin()Craig Scott2021-09-064-68/+28
| | | | | | | | | Change-Id: I1f503cd03c35e48f2219e95db57b153c69badb0b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9fdb12bdac0efd9875b2d98ae82c3702cf722469) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix righttoleft example to use a QML moduleOliver Eftevaag2021-09-065-62/+29
| | | | | | | | | | | Updated CMakeLists.txt to use qt_add_qml_module(). Copyright headers and import statements have also been updated. Change-Id: I8093d186f433293e63c6330def579f5589a938e6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 56b47052b875a065f577411541e57dd9c50ace57) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtdeclarativeQt Submodule Update Bot2021-09-061-4/+4
| | | | | Change-Id: Id731ffa8b89cf07480d98ca0d420ecff3009401a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 10:32:42 +0000