aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+49
| | | | | Change-Id: I27b28095a9481b962fe450be9f67b31f36880dac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-021-2/+4
|\ | | | | | | Change-Id: I6450d9ea1e5e2081e5ed79f02d485515b582c4f0
| * QQuickPlatformMenu::open(): Scale target rectangleFriedemann Kleint2018-02-011-2/+4
| | | | | | | | | | | | | | | | The QPlatform* classes operate in native pixels. Task-number: QTBUG-55251 Change-Id: Ic9715bc062f7459054ed9735d133b1a5d05b60a2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-316-2/+36
|\| | | | | | | Change-Id: I697f98d5214f487c915032d744ec593da05368a8
| * QQuickComboBox: fix popup's deferred executionJ-P Nurmi2018-01-242-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other delegates, such as background and contentItem, popup is not unconditionally executed upon component completion. For performance reasons, its execution is delayed until the popup is needed, that is, the popup is accessed or shown. When the popup is accessed, we use the current completion status via isComponentComplete() to determine whether its execution must be completed immediately, or if we can wait until componentComplete(). However, if the popup was accessed while the combobox itself was being completed (used in ComboBox's bindings), the popup was never completed because isComponentComplete() was still returning false even though the popup was actually being indirectly accessed from componentComplete(). A simple execution order change, to complete the combobox itself before the popup, fixes the problem. Task-number: QTBUG-65962 Change-Id: I4764eb7e273e7f6fa1dab1a65a02b87722ee7cba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Control: fix background size regression caused by deferred executionJ-P Nurmi2018-01-222-0/+9
| | | | | | | | | | | | Task-number: QTBUG-65880 Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Explain the benefits of customizing a control vs creating a styleMitch Curtis2018-01-191-1/+11
| | | | | | | | | | | | | | | | | | | | | | Mention that customizing a control is nice because you don't need to start from scratch with a template. Add a third requirement for "Definition of a Style" that mentions that the top level item must be a template, and why. Change-Id: I4db4ec8311baed46fb45271d107204808ba42592 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Link to Customizing doc from Styling docMitch Curtis2018-01-191-0/+1
| | | | | | | | | | | | | | These two things are closely related. Change-Id: I1b4586f7835af6bd9f82aaa6eeb75fe1ef6ba65d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_qquickiconlabel: skip colorChanges() that grabToImage() on offscreen ↵Liang Qi2018-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | platforms The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Change-Id: Ifac43dfa26182e3b518397fa070bb4d4a62114e0 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | tst_qquickiconimage: skip tests that grabToImage() on offscreen platformsMitch Curtis2018-01-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Task-number: QTBUG-65975 Change-Id: I037110408bd7b676d6ca142808774b29d1aa749f Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Doc: provide examples of setting Imagine pathMitch Curtis2018-01-241-0/+28
| | | | | | | | | | | | | | Remove any ambiguity about how the paths might be specified. Change-Id: I004e13349a54ded9a41586a8f5a564731a821585 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Use shorter ':/' prefix for Imagine style example config pathsMitch Curtis2018-01-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | Using either :/ or qrc:/ will work because we handle both cases in QQuickImagineStyle::url(), but for local file paths, we don't have any handling for the file:// prefix. This patch just makes the examples more consistent. A follow up patch will document examples of specifying the different types of paths. Change-Id: Ib7fc2fe012242f9b225b4380ca066107b77d0680 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix test_itemsCorrectlyPositioned() failureMitch Curtis2018-01-221-0/+1
| | | | | | | | | | | | | | | | | | Ensure that "moving" is false before comparing the y position of the delegate item. Change-Id: Ie23e86c1f89180c5afca3a48b9361a82635d5e39 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Fix Action shortcuts in RepeaterJ-P Nurmi2018-01-222-1/+31
| | | | | | | | | | | | | | | | | | | | QQuickRepeater does not set a QObject-parent, so make QQuickShortcutContext::matcher() start from the object itself and if no window is found, then iterate to the QObject parents. Task-number: QTBUG-65889 Change-Id: I30a1ed0616edd002abcf28d1b8dc7e2d87e99c13 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-1813-42/+177
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Tumbler.qml src/quicktemplates2/qquicktumbler.cpp src/quicktemplates2/qquicktumbler_p.h src/quicktemplates2/qquicktumbler_p_p.h Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+63
| |\ | | | | | | | | | Change-Id: I4a75933d225c276348f2d3ade855b3415bba4439
| | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-051-0/+63
| | | | | | | | | | | | | | | Change-Id: I03415ed1c96190aeb69bb7371068464684080776 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Tumbler: reduce amount of signal-slot connections and change listenersMitch Curtis2018-01-173-85/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of adding change listeners and signal-slot connections for each attached object, add them once in QQuickTumbler and then notify each attached object all in one go. Change-Id: I6c5e76182c026b24922dcddaeb08ae4b1d4c4c38 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Tumbler: qualify references to visibleItemCount with "control"Mitch Curtis2018-01-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This code currently works, but we prefer to use control.<property> to access properties directly. Change-Id: Ieba95bffdd0b0a9b33373524248d0ac06e9f2a3d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Make Tumbler compatible with deferred executionMitch Curtis2018-01-178-76/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the contentItem is created at a different stage, we have to shuffle some code around and add some null checks. Task-number: QTBUG-50992 Change-Id: I34d3a9ea9cb9ab54008a1015b37b1666538c085e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Imagine/Switch(Delegate): cleanup internal IDs for deferred executionJ-P Nurmi2018-01-183-8/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I621343bef562b4ed85202a0690a0cccfc0a053c5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine/DelayButton: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-182-13/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I5f2708bc0e9f37232b10e2cd6f1c61ab779156e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine/ProgressBar: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-182-19/+16
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I1f31b23f3db23e5582b74b18ed643e8263d99142 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine/BusyIndicator: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-182-5/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Idee1a13355e36e9221b32cdf9b89b4090dcf87b4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine/GroupBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-182-7/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Ied6b4365d03fc1ef3ae3a69667f1cb1fc8cdb9ac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine/SpinBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-182-6/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Iaabd561b2bd009d3db970f370eff6fa717164961 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Tumbler: qualify references to visibleItemCount with "control"Mitch Curtis2018-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code currently works, but we prefer to use control.<property> to access properties directly. A similar patch was done for the styles that were available in 5.9. Change-Id: Iff12162464daa6b10fa8d3f322e0e61632713d08 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | ComboBox: fix popup's deferred execution for the new stylesJ-P Nurmi2018-01-153-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | Same as 3ec6d04d in 5.9, but for the new styles in 5.10. Task-number: QTBUG-50992 Change-Id: I211c0e6c0b290c1af310898f21850f9fad01b278 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Tumbler: cleanup internal IDsJ-P Nurmi2018-01-153-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | Same as d61567f in 5.9, but for the new styles in 5.10. Task-number: QTBUG-50992 Change-Id: If47df3796eeadb997bfc76ce6dd6a3b14372ff2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵J-P Nurmi2018-01-157-51/+106
|\ \ \ | | | | | | | | | | | | refs/staging/5.10
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-157-51/+106
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickcontrol.cpp tests/auto/sanity/tst_sanity.cpp Change-Id: I62a79fd7788fec635b9917fc91bacd7338b547fd
| | * | Tumbler: cleanup internal IDsJ-P Nurmi2018-01-114-23/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can already cleanup the internal IDs even if Tumbler doesn't have deferred execution enabled. Change-Id: Ide9a0a6c6d1680c6df6b968b5702a6270fea3326 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | tst_sanity: check for internal IDsJ-P Nurmi2018-01-112-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65341 Change-Id: I51bd3390a18e50e37dfdd880dfa8df262d478b04 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | tst_sanity: unblacklist ComboBoxJ-P Nurmi2018-01-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBox no longer creates a popup instance at construction time. Change-Id: Ie036d75acbd2a7a391c1ed1af590409f4eddd587 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | tst_sanity: exclude internal helper typesJ-P Nurmi2018-01-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test file names against registered QML types to avoid including any internal helper types like CursorDelegate.qml and RectangularGlow.qml. Change-Id: Ia3079ea215eea59f7e405a50c3170fb4530f4239 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Remove unused QQuickControlPrivate::destroyDelegate()J-P Nurmi2018-01-112-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65341 Change-Id: Ib64ec7ede42c140483554cf75e9bc16aa147be6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | MenuItem: use deferred execution for the arrowJ-P Nurmi2018-01-158-8/+66
|/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Ifb41a8caf6b406249d6da4783c546816d9b51581 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fusion: eliminate internal IDs to enable deferred executionJ-P Nurmi2018-01-1110-80/+68
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65341 Change-Id: I3bfd36f1d1e275eb507184c376599aa7751a069e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | tst_customization: add data rows for new controls in 5.10J-P Nurmi2018-01-1011-1/+654
| | | | | | | | | | | | | | | Change-Id: I7cf0a01648d95c386cbf916107546e4f46fadc73 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵J-P Nurmi2018-01-10217-425/+7782
|\ \ \ | | | | | | | | | | | | refs/staging/5.10
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-10217-425/+7782
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/CheckBox.qml src/imports/controls/CheckDelegate.qml src/imports/controls/ComboBox.qml src/imports/controls/DelayButton.qml src/imports/controls/Dial.qml src/imports/controls/ItemDelegate.qml src/imports/controls/MenuItem.qml src/imports/controls/RadioButton.qml src/imports/controls/RadioDelegate.qml src/imports/controls/SwipeDelegate.qml src/imports/controls/Switch.qml src/imports/controls/SwitchDelegate.qml src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc src/imports/controls/material/CheckDelegate.qml src/imports/controls/material/ItemDelegate.qml src/imports/controls/material/MenuItem.qml src/imports/controls/material/RadioDelegate.qml src/imports/controls/material/SwipeDelegate.qml src/imports/controls/material/SwitchDelegate.qml src/imports/controls/qquickdefaultbusyindicator.cpp src/imports/controls/qquickdefaultbusyindicator_p.h src/imports/controls/qtquickcontrols2plugin.cpp src/imports/controls/universal/CheckDelegate.qml src/imports/controls/universal/ItemDelegate.qml src/imports/controls/universal/MenuItem.qml src/imports/controls/universal/RadioDelegate.qml src/imports/controls/universal/SwipeDelegate.qml src/imports/controls/universal/SwitchDelegate.qml src/quickcontrols2/quickcontrols2.pri src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickmenu.cpp src/quicktemplates2/qquickpopup_p.h Change-Id: Ib25c8b4a7fe018b7c0ade9b02bfaaa6980118c15
| | * | Add creation benchmarks for qmlbenchJ-P Nurmi2018-01-0547-0/+784
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmlbench repo has benchmarks only for a subset of controls. They are part of a larger collection of benchmarks that are run periodically, for which the results are collected to Grafana. We have limited resources there, so we don't want to overload it with benchmarks for every single control type. However, for our own benchmarking purposes it is useful to be able to easily benchmark all of them. Change-Id: I920e4c07bce8356e5d9f41d4c1d6ae43e37bb13e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Doc: improve Style/FallbackStyle documentationMitch Curtis2018-01-042-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to relevant documentation and add entries for the Controls section to the configuration file docs. Task-number: QTBUG-65445 Change-Id: I175866167e36403475520ea4de0cb299aae542d7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * | Document license and attribute third party codeKai Koehne2018-01-043-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Document constants from AngularJS in src/imports/controls/material/ElevationEffect.qml Task-number: QTBUG-65409 Change-Id: Ibd0dcf643abe036f34cea364f267fde8510057ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * | Fix qmlRegisterType() for RoundButtonJ-P Nurmi2018-01-041-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | RoundButton was a new type in QQC2.1 (Qt 5.8). Even though passing a non-existent revision seems to be harmless, registerTypes() becomes easier to read when we distinguish between new types and new revisions. Change-Id: I682006570f63dd0b2cb2260740fb105619e61a28 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Material: cleanup the internal ID from BusyIndicatorJ-P Nurmi2017-12-224-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as da27cace for the Default style. An internal ID in the OpacityAnimator element prevented deferred execution for the whole content item. Apply the same visibility trick in C++ to avoid having to use an ID in QML. Change-Id: I4b54bbe3044aff9603b1135ac25d7325e01fdff2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix and test deferred execution for Universal & MaterialJ-P Nurmi2017-12-225-15/+10
| | | | | | | | | | | | | | | Change-Id: I8ee27a0c65c9ce8c9cc48c6f59d2b34d02849be8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * tst_customization: comment out Tumbler for nowJ-P Nurmi2017-12-221-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to unclear auto test failurs, Tumbler does not yet have deferred execution enabled for its content item. Because of this, the test is getting full of skips and expect fail's for Tumbler. Just leave it out for now and restore later when Tumbler is fixed. Change-Id: Iab9465e002572d15e5bda6dbd53b71594f593703 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix tst_customizationJ-P Nurmi2017-12-221-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | Fix style selection, and make override() actually fail with internal IDs in the built-in styles. Change-Id: Ied321c46cd74039f84b683fb6df99aef2d488eef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: update code snippet to add some content to the DrawerMitch Curtis2017-12-221-0/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-60550 Change-Id: I14c4d0343e2b02180bbce0546a69a7241ee6008e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 17:36:28 +0000