aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix -no-accessibility buildPeter Varga2020-05-112-0/+4
| | | | | | Change-Id: Icbae79fd0f48fb9351ee8cc12b35ead7e99b09e2 Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Container: remove deprecated removeItem(var) overloadMitch Curtis2020-05-113-20/+2
| | | | | | | | | [ChangeLog][Controls][Container] The deprecated removeItem(var) function was removed. removeItem(Item) or takeItem(int) can be used instead. Change-Id: Ibc693a9216cd039fc11cb4e5182f74a96f493796 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* ComboBox: make pressed read-onlyMitch Curtis2020-05-112-1/+2
| | | | | | | | | | This was planned for Qt 6. [ChangeLog][Controls][ComboBox] The pressed property is now read-only. The down property can be used instead. Change-Id: Ie241a420ac228207b3f564af66d3eb3738f6a145 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* HeaderView: always use headerdata from syncView modelRichard Moe Gustavsen2020-05-051-7/+2
| | | | | | | | | | | | | | | | | | | When HeaderView has a syncView, it should always use the header data of the syncView as model, and not only when that model is an QAbstractTableModel. Otherwise you cannot use headerView together width models like e.g QFileSystemModel (which is a QAbstractItemModel). If HeaderView has a syncView, but its model doesn't contain header data, then just leave the header empty. The application must either assign an model explicit to HeaderView, or provide header data to the syncView model. Just transposing the model will just duplicate the data in the syncView, which looks wrong. Pick-to: 5.15 Change-Id: Ie48e960be8bf9fdd3ed227d90c6efb6aabfd18b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Put the Qt Labs Calendar module under BSD licenseVolker Hilsheimer2020-04-2920-360/+640
| | | | | | Change-Id: I08202c7a18e5a125b419ad81baf9f8b3939bc281 Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Adapt to geometryChanged => geometryChange renamingMitch Curtis2020-04-2448-74/+74
| | | | | | Task-number: QTBUG-82994 Change-Id: Iaf530d2a6f4dc92641d0c10e16e7b931f90646ac Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: explain how to allow Menu to move outside of the window via marginsMitch Curtis2020-04-211-0/+8
| | | | | | | Task-number: QTBUG-82279 Change-Id: Ibc9bae71995f140882dd0f636ff360af8ac0337c Pick-to: 5.15 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix build with latest QHash from qtbaseMitch Curtis2020-04-171-10/+8
| | | | | | | This is the same as what was done for 13ede1b9 in qtdeclarative. Change-Id: I00c7a066954efde0e569d24c267e734c31829c5b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Material: revision sliderDisabledColorMitch Curtis2020-03-311-1/+1
| | | | | | | | This amends 0d5a43fa8. Pick-to: 5.15 Change-Id: I68c500ae874c92467b414dbf37eec9d55b3c730f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update includes of QAction after move from widgets to gui in qtbaseVolker Hilsheimer2020-03-312-2/+2
| | | | | Change-Id: I1e2ab9678468d5fa0b4653a6edd5353c5eb5f8a1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-3124-36/+87
|\ | | | | | | Change-Id: Ie09cfdd17b00e56f3ba8677d25b24417dd4e42f6
| * HeaderView: Add support for list based modelsAndy Shaw2020-03-2412-13/+53
| | | | | | | | | | Change-Id: I411136bd2b9a277d84a7c68c55bb1c317b6cc9d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-217-18/+19
| |\ | | | | | | | | | Change-Id: I9ecddc7a68da4f15ee2c2904e237496eb6a2aa26
| | * Doc: Make sure import is highlightedKai Koehne2020-03-204-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use \qml ... \endqml to allow qdoc highlighting the import as QML. Also parameterize the example import QtQuick.Templates import so that it always uses the last import version. Change-Id: I3fecc8b301c58a89769caf5aa3a764551ff683b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Menu: account for the scale when getting the size before positioningAndy Shaw2020-03-182-7/+8
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-73687 Change-Id: Id2d6a6b5c6651337ab7ae26d07011160b79654bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: Fix highlighting of importKai Koehne2020-03-091-2/+2
| | | | | | | | | | | | | | | Change-Id: Ic1f1583d6956180470ddd9d4869ea437c05be343 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Account for the padding around a menu when checking if it is interactiveAndy Shaw2020-03-185-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is padding around the menu then it will mean the available height is smaller than the containing item and as such should be interactive. Fixes: QTBUG-82473 Change-Id: Ie3e7568ab66aa3da93e5448c1a27c9bd2a5e486a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-03-233-8/+8
| | | | | | | | | | | | | | | | | | | | | Fix build after internal QtQml API changes. Change-Id: Iaeafb84f5f2d9c60b54659f27e7baa448a858c4a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix Qt 6 to-do comments in QML filesMitch Curtis2020-03-239-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove what appears to be code for backwards compatibility in the sizing of certain controls. Removing the code shows no discernible difference in the appearance of those controls. [ChangeLog][Controls][Tumbler] implicitWidth and implicitHeight must now be provided for Tumbler's contentItem, as with all other controls. Change-Id: Id858b6d13bfd81d8f30be57290fb260404652a4c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | CMake: Regenerate projects after changesAlexandru Croitor2020-03-201-2/+0
| | | | | | | | | | | | | | | | | | | | | Amends 31f5c21ddb571d744efd1885c0687816b3a12225 Change-Id: I870de5ce096b13b24f58f5cbef9cd701286916dd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Remove the remaining usages of QRegExp and QRegExpValidatorLars Knoll2020-03-192-13/+13
| | | | | | | | | | | | | | | Change-Id: Iab8e682eeb43b3403eba37f7decb7f7a494ae361 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix build after QJSValue API changesSimon Hausmann2020-03-191-2/+2
| | | | | | | | | | | | | | | Change-Id: I21ba3fc72951b946e84eb8c7c85f73ff4276eaac Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | Remove old QQuickPalette implementationVitaly Fanaskov2020-03-1894-1769/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing implementation was removed in order to reduce massive code duplication and simplify color resolving process. Unit tests were fixed accordingly. See related changes in the qtdeclarative module for the further details. [ChangeLog][General] the palette API is a part of QQuickItem now. Change-Id: Ic94ab4632e626c11d9b26f035e2a8a119c9088ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-03-187-31/+67
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-187-31/+67
| |\| | | | | | | | | | | | | | Change-Id: I88990095b97a4088f9fda6c9496fd69d4556f6a1
| | * | Material: Make Slider's track accent colored and semi-transparentPaweł Gronowski2020-03-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Material Design guidelines Slider's track should be accent colored and semi-transparent. Additionally it should be a bit thicker. The original ticket in the bug tracker mentions it to be 2px 2px but I think that the 4px makes it look a lot more like the one presented in the guidelines (https://material.io/components/sliders/). Task-number: QTBUG-70768 Fixes: QTBUG-70768 Change-Id: I062c0938297ae877b37605b6d536e11b464d477f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Material: Make RangeSlider's track accent colored and semi-transparentPaweł Gronowski2020-03-171-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To match the Slider's appearance. Change-Id: Ida7a03877c7b8a23508c532dbb275f96bc137742 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Material: Change RangeSlider's color to grey when not enabledPaweł Gronowski2020-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0cc390e1a46242ef22bb7d5460701e7b14087ee7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Material: Change slider's color to grey when not enabledPaweł Gronowski2020-03-174-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Slider was not enabled it would look exactly the same as when enabled. [ChangeLog][Controls][Material] Add visual distinction between an enabled and not enabled slider. Task-number: QTBUG-70768 Change-Id: If0d7e5adc19d8bc22a810cb2ba4e57b657ab48d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | SplitView: fix hidden items causing visible items to not be resizableMitch Curtis2020-03-132-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a handle is dragged, the items on either side of it are resized. Until this patch, we were assuming that the item after the one at the handle index was visible, which was wrong. Now we iterate through each item after the one at the pressed index until we find one that's visible. Since we need this in a few other places during a handle drag, we cache it as a member variable. This patch also fixes an issue where the visibility of handles were not updated after setting a new handle delegate. Change-Id: Icd246abae2ed4dc6c3b81217b9a241b7e4debf7d Fixes: QTBUG-81867 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | CMake: Regenerate projectswip/cmakeAlexandru Croitor2020-03-177-0/+823
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd6b2289de6465a010f5f2a32789221767b4d5be Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-17136-311/+2392
|\| | | | | | | | | | | | | | | Change-Id: Ieb9bcfba9651d646509afd065ce2389ef74448cc
| * | | Adapt to plugin unloading changesMitch Curtis2020-03-126-15/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of c2081016e in qtdeclarative, plugins are no longer unloaded on macOS, and QQmlExtensionPlugin::unregisterTypes() should be used instead. This patch: - Moves everything that was done in destructors to unregisterTypes(). - Ensures that the style selector is destroyed in QQuickStylePlugin::unregisterTypes() so that previous styles that were set do not stick around after qmlClearTypeRegistrations() is called. This ensures that runtime style-switching continues to work. - Adds more logging output to make it easier to diagnose issues in the future. - Adds more code comments to ease maintenance. Change-Id: Ibbfeba4501d6ba0d5a257dcceace3498904a816e Fixes: QTBUG-82811 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Fix build failures as a result of QMetaType changes in qtbaseAlexandru Croitor2020-03-1217-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moc now stores the QMetaType of properties as a result of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires full type information about the property type inside the moc generated source file. Many of the property types were forward-declared, and this resulted in build errors like "invalid application of 'sizeof' to an incomplete type 'QQuickTransition'" Make sure to explicitly include the moc files inside the counterpart .cpp files, so that full information is available from included headers. Fixes: QTBUG-82774 Change-Id: I5971713864992398daed72ce9f6ab866668cf8e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-03-1040-29/+1667
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/qtquickcontrols2plugin.cpp Change-Id: Ifc09ea9f71fdba119fe8eed99f0bdcb402444f27
| | * | HeaderView: set implicitSize on the style itemsv5.15.0-beta2Richard Moe Gustavsen2020-03-1011-24/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By setting an implicit size, the user don't need to set a width or height on a HeaderView himself, but it will get the default size recommended by the style. By doing it the way it's done in the patch we achieve the following: 1. A HeaderView will by default be resized to be the same size as the delegate. 2. If the application sets a size on HeaderView it that is larger than the implicit size of the delegate, the delegate will be resized to have the same size (effectively filling out the free space in the header). 3. If the size of HeaderView is smaller than the implicit size of the delegate, the delegate will simply be clipped. (effectivly saying that the implicitSize of the delegate is also it's minimum size). If this is not acceptable for the application, it will need to use a custom delegate. Since a HeaderView delegate is a component and not an item, it should not be a part of the sanity checks we do to avoid using internal IDs. Hence we blacklist until we have a better way of handling such cases. Task-number: QTPM-1300 Change-Id: I30ca3e13ce5e1371b60f5c4ecf742a7d7e794a36 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I3ed1abd00bf54da654c9ccade427f5756b99b595 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Update the current text after a translator is installedMitch Curtis2020-03-052-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if the model is updated due to a retranslate that it gets the updated string and the ComboBox shows it correctly. Change-Id: Iecbc18a1051d6db13035b3efa393d9bf97788dd9 Fixes: QTBUG-82020 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Imagine: fix Dial being squishedMitch Curtis2020-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Since we probably don't want to wrap the background in an Item, use "fillMode: Image.PreserveAspectFit" on it to ensure that the background isn't squished. - Use the same binding for the Translate's y property as we do in all of the other styles. Fixes: QTBUG-82463 Change-Id: I43129959e03ad489a8c231a7a42c192264b380ac Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-226-7/+22
| | |\| | | | | | | | | | | | | Change-Id: Iff02839c8ace49582750e06fa1ea9c559f6c93fe
| | | * Fix clicked() being emitted after doubleClicked()Mitch Curtis2020-02-202-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do as MouseArea does, and keep track of double clicks ourselves, otherwise we think the second click is a regular click. This is for mouse events only; for touch we have bigger problems to solve first: QTBUG-82146 Change-Id: I46e816d0cfa1bab98a0a1685915842ebd176e762 Fixes: QTBUG-82032 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | | * ToolTip: fix timeout not activating if opened during exit transitionMitch Curtis2020-02-201-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a tooltip with an exit transition and a timeout is made visible during its exit transition, it would end up not timing out. This is because the change in the tooltip's visibility is what usually kicks off the timeout timer, but if there is no change in visibility (because the exit transition hadn't finished, so the tooltip was still visible), this won't happen. Fix the issue by calling startTimeout() in QQuickToolTip::setVisible(). Change-Id: I5f95a698e48f376c7597558572ac91625a276e53 Fixes: QTBUG-81935 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | | * clang-tidy: fix bugprone-integer-divisionMitch Curtis2020-02-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An example of one of the warnings: qquickfusiondial.cpp:87:15: warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division] Change-Id: I9d225e8149935a8f8dde6e8b0657c1406676b7f1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-02-158-12/+37
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: Id3bca2da290234f3c69845ffe18c6d9193a1bd28
| | | * Account for when a touch event is synthesized by Qt as a mouse eventAndy Shaw2020-02-072-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a control is on a Flickable with a pressDelay then any press events sent from a touch device will be replayed as mouse events due to the delay. As a result we cannot depend on the fact that we got the first press as a touch event when checking if the id matches before accepting it. So we need to keep the previous pos when it is a synthesized mouse event so we can ensure the release is also accepted. Fixes: QTBUG-77202 Change-Id: I6f5d8506bd803daf834093e8fd412504150c4ca6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * DialogButtonBox: don't change button text that has been explicitly setMitch Curtis2020-02-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a custom button is declared in a DialogButtonBox, qsTr() will take care of translation, and so we shouldn't touch it. Amends c18c7bd7f9596e5ad3d13876a91203e1ceba2544. Change-Id: I06221002cf850882f5318cf0a3ed86da35274d0c Fixes: QTBUG-81796 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | | * Copy Qt Quick Designer-related files also for static buildsKai Koehne2020-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the 'designer' directory is copied to the build directory, or installed, also for static builds. This reverts the !static condition introduced to fix a build breakage in 01d076d0e81e5 . Anyhow, I couldn't reproduce the original problem (QTBUG-51708), nor is it clear why it was caused by the static build. Fixes: QTBUG-75682 Change-Id: I47af3907e464d4fd9e9965ac28545b7350f450ee Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | | * Follow QML2_IMPORT_PATH in path searchDavid Edmundson2020-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for styles we include QLibraryInfo::Qml2ImportsPath so it makes sense to continue that to also include the runtime QML2_IMPORT_PATH when searching for QQC2 themes. It used to be included, but in 5.14 this behavior changed as a result of 7db4df2deca52a30b4c068abd4683a1720cf281e, so this line is restored. Change-Id: I185b29b323d870fc724e655104eaf42034707738 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Doc: fix RangeSlider errorsMitch Curtis2020-01-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the RangeSlider was copied into another file as a child item, it would produce errors about first and second being undefined. Change-Id: I0ecc9f6830509183a1b2b35e3faed5f06e78a0ef Fixes: QTBUG-80970 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | | * set placeholderText by default, not textTim Jenssen2020-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QDS-456 Change-Id: I05b7ce9efab851b99d12ba272a79bf9ba4443398 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 01:06:25 +0000