aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: document the native stylesv6.0.4Richard Moe Gustavsen2021-04-288-0/+162
| | | | | | | | | | | This patch will add documentation for the native styles that was added to Qt 6.0. Fixes: QTBUG-88220 Change-Id: Ib0703b3758d48586cd8465ea9188691b9e377064 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 30cf78d48f6a3778e8b4ec2e2b8924b25fdc85cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-281-1/+1
| | | | | Change-Id: I1d9438ee77fd8193764cf37dac4f60da67152aa9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-281-1/+1
| | | | | Change-Id: Ic4682da23c461c762d010798fd2bec35c3e97f78 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Avoid duplicate symbol errors due to a common resource nameAlexandru Croitor2021-04-271-1/+1
| | | | | | | | | | | | | | | | The macOS nativestyle plugin uses the 'qmake_immediate' resource name, which conflicts with any test / example that might create a resource with the same name. This is problematic in static builds because it causes duplicate symbol errors when linking. Use a different unique resource name instead. Fixes: QTBUG-93172 Change-Id: I29dee69190d75fe11c8993353349e3db2004d276 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit cc2d45fd72a764312be9757ef96cc9abd5d1b423) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-271-1/+1
| | | | | Change-Id: Iaf9f31d3b4759f24ad2b4b7d3842f60c60d92723 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix build without features.shortcutTasuku Suzuki2021-04-273-0/+7
| | | | | | | Change-Id: I871e115f27c3c43a9e9b2e23392cd1dcbfb0cec0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d184a72af73af0a3984ecac6179e3a5294838af4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-271-1/+1
| | | | | Change-Id: Ibb0d4654e2e2661274c1cbb1a8f06ee27e86d525 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* ScrollView: fix crash when scrolling with zero-sized itemMitch Curtis2021-04-263-1/+35
| | | | | | | | | | | Check if a Flickable type was actually set as the contentItem before accessing the pointer. Also warn that using a type other than Flickable is not supported. Fixes: QTBUG-93039 Change-Id: I1470766c6de02b7b601edf1375791d3147f26ab5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e7df2279bf5519703fd0b853abaa23947a599920)
* Fix namespaced Qt buildKarsten Heimrich2021-04-261-3/+3
| | | | | | | Change-Id: I688bdd73c939304f572d0e162e7aa09499bf737f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 57614bc6719c9e63e53ad0a484c554852ebff5f4) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-261-1/+1
| | | | | Change-Id: I0c346f2c2a0b690f65d30622d8a6006f4fabe909 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Native style: fix statically built apps that links to both widgets and controlsRichard Moe Gustavsen2021-04-222-4/+24
| | | | | | | | | | | | | | | | | | | | | | | The c++ symbols are already namespaced into QQC2. But since there is no namespace concept in obj-c, we use QT_MANGLE_NAMESPACE to wrap those symbols into a "fake" namespace by concatinating symbol name and namespace name together. The problem is that QT_MANGLE_NAMESPACE only take the QT_NAMESPACE into account, and not the additional QQC2 namespace. The result is that the application will fail linking because of duplicate obj-c symbols when you combine widgets and controls in a statically linked application. This patch will redefine the affected macros locally in qquickmacstyle_mac, so that both the Qt namespace and the controls namespace are taken into account. Fixes: QTBUG-92883 Change-Id: Ic2f84ad9c0005fdd2553729d897cee113a4ff24d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit a372b35d93d4deb14ba9b855c49bcbd328b32381) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-221-1/+1
| | | | | Change-Id: Ie6e56ac0c945328e5d25784a6a04c54b9c3b3af4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-221-1/+1
| | | | | Change-Id: I7a27bf175eef3711d4bab90866dc4afe2e5feb64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QmlDesigner: Fix RangeSliderSpecifics snap modeHenning Gruendl2021-04-211-1/+1
| | | | | | | | Task-number: QDS-4212 Change-Id: I82d524960a34e9307ddf9b154a326d8fadc7387c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit f42abbcb7794bcfc884e8aee75f73bd9ab8fbda4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-211-1/+1
| | | | | Change-Id: I115eae8f81db8e28b18e415424a871d929d9ca72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-171-1/+1
| | | | | Change-Id: Iba7ffa3efd327f8b5f2599ad4de8d93813514b56 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-171-1/+1
| | | | | Change-Id: If42c23969d45e6a53b0a59191bf42eabdfdb6b50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-1619-19/+19
| | | | | | | | | | | Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the repo project version is used in a top-level build, rather than the version of the qt5 project. Task-number: QTBUG-92861 Change-Id: Ifd12d6309f358b9b72372a5c069141ecb7322bc7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 22e3b6d2292ded526354569a1ffb342a660f1f80)
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-161-1/+1
| | | | | Change-Id: I29822a5153c16c62efc01656b49a908af0d6ddf8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-151-1/+1
| | | | | Change-Id: Ia2f145be5d9d608c6f4a886a43643835d694d27e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-141-1/+1
| | | | | Change-Id: Id4fda4b40df951b41c93e92ed943a2b2edc706ba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-091-1/+1
| | | | | Change-Id: I918102b4d0385ec1783ff2b86dae58e6efd70a38 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-091-1/+1
| | | | | Change-Id: I66be41db03013b962f730effd67414fa07fb768b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-081-1/+1
| | | | | Change-Id: I1a203511fa1dfea8d4cae2e01c1699fd1cf8499c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-04-012-2/+2
| | | | Change-Id: I07e2612a092be4d390b603a9538904c7743a314f
* Ninepatch: keep resetNode status to not lose track of ↵Laszlo Agocs2021-03-311-1/+6
| | | | | | | | | | | | | ImageNode->NinePatchNode changes Basically does what 788865b805bc91151ac8fe18bf7b92b1212ee07d did, but on the other branch. Fixes: QTBUG-87236 Change-Id: Ie8371de8a9d49054c888e4bffb7e89392a6d7c07 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 764b21987e36bc0734b7e8c9aab0e0d25771b56e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-311-1/+1
| | | | | Change-Id: Ife2350f304550bea8fbccd2ba38cb34bc42c6584 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-301-1/+1
| | | | | Change-Id: I2d406f99019518ca05e22a3fcd8dc395e4360a39 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-291-1/+1
| | | | | Change-Id: Ib2b861017ac660000b80cc73ef871650a8b3e3d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-261-1/+1
| | | | | Change-Id: Ie647c8ff8a28b7b93478a38e66b89e81a2812577 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2v6.0.3Qt Submodule Update Bot2021-03-251-1/+1
| | | | | Change-Id: I5137fd4609a01a058c6acad14c978ac916d7b282 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-241-1/+1
| | | | | Change-Id: I66ba4da7973dacd169c28c715a707a6a0f8dcc4e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Handle directly-delivered mouse events in SwipeDelegateShawn Rutledge2021-03-239-118/+133
| | | | | | | | | | | | | | | | | | Delivery order has changed to be the same as the z-axis stacking order (since qtdeclarative 3ff11ceca37dcc4b6f0420332fa7f6aa007be7f3). Since QQuickSwipeDelegate puts its children under itself by setting negative z-values, it can now receive mouse events before those negative-z children, directly rather than via childMouseEventFilter(). It doesn't seem to be enough to ignore() the events and let them propagate: we now need to explicitly forward them to interactive child items, and to child items' Attached objects, if any. Fixes: QTBUG-87018 Fixes: QTBUG-87789 Change-Id: I1e02ceddad7c3221fb09a33046941d654bfa8a4b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 69162120c735801905893f90bef38b49464f6bb9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-231-1/+1
| | | | | Change-Id: I50e6f0541865e6b1eb02a546b3d41ce4e2ed96c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-231-1/+1
| | | | | Change-Id: Ia4bd5aa180a1a1960eaebe85222dcd09bef7b644 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Binary compatibility file for Qt 6.0.0 added for QtQuickControls2Milla Pohjanheimo2021-03-221-0/+14468
| | | | | | | | | Binary compatibility file added. Change-Id: I72aecee565c3cb2e6726a401e37f8fef1763c63a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 067e61f580614c08761a59656a4b31761e4e7878) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-221-1/+1
| | | | | Change-Id: I7a91c28d278dd97ae0d24ee7d7dae515feac2287 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-221-1/+1
| | | | | Change-Id: I2787055b8ca031c2c572a02722ecad3a078385b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-191-1/+1
| | | | | Change-Id: I066ed4fff489cfec95144c67621bbb75166c7c05 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-181-1/+1
| | | | | Change-Id: I5ded40e8bbfeabc67d7a945a3037f5b0874d9e63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-181-1/+1
| | | | | Change-Id: I632d9d74926049c16a0cd7db1b58e14601b4f8a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-171-1/+1
| | | | | Change-Id: I3250ae5ae603c46f02fe90d1d61f4355f78f9207 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-131-1/+1
| | | | | Change-Id: I5cf28719e7afb4634b6e4b19e3932e67a66de350 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-121-1/+1
| | | | | Change-Id: Ic0ca550bbd30c8841a5f5697740f4cf833415de5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-121-1/+1
| | | | | Change-Id: Ief670cf37f143fea00071b103c8301590d50eb15 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-121-1/+1
| | | | | Change-Id: Id5fc344579cfddb423210e343e845edda46ba5b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-121-1/+1
| | | | | Change-Id: I93516aa599eded6551de4994cf1a8623c1b02b7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-111-1/+1
| | | | | Change-Id: I5b99ef68cdd323eb690c2410f0a7381c5e42353c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Change section titles that cause bad linksPaul Wicking2021-03-111-3/+3
| | | | | | | | | | | | Section titles are valid targets for QDoc's autolinker. When they are identical to other valid link targets, such as for example a class, these sections may cause invalid links. Task-number: QTBUG-91141 Change-Id: I466b2d21be030cd34b2a734d5126c45ff763127b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 5d76e666e3792230fe714676e3a1bc5c1e9ad926) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-111-1/+1
| | | | | Change-Id: Ie99585badd0e4aacaf3b15230332d0d1a3d3580b 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-06-05 00:24:11 +0000