summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+27
| | | | | | | | | | | | | | | | | + 0489c0a88a293696592c5892383698a015ae68c7 Improve startup benchmark + 602f1225938f9338c3ee799c64d5449ebc12b8bc Refine startup benchmark termination condition + cf957e407030fc260bd86882cf2f79724126abdd Bump version + 10b3bffbd21b6265a3d124f310c99fcbac2b027f TableView: Handle dynamic insertion of TableViewColumns correctly + 6b7f91c097f7e47cf2683d08b5838fd061a872bd Add changes file for Qt 5.11.3 + 50b6fb27458708a18f4114e3ebec0fa632b2659f Unskip test of fixed bug + 80ba7e03afe18cc44715f7cf9a038bedff01f328 QQuickTreeModelAdaptor1: fix out of range issue in selectionForRowRange + 8abf15b4ba974576e13f37b09117454fc1e6b1d9 Static: Install the qmldir for the Styles module + a9436b597916d5619cbbbbd103bc482ddaf4359a Static: Register the base style qml files so they can be found + 69c7e95da101d4d66d25c4850f3591d4ccd2bbc1 Insert before next item when it exists + bd952e904070d8eb07748d620829e9dadb8022ba Bump version Change-Id: I26d4c9fd88ddc3c17cad7a0b75b63b3527da03b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I04bcfbe22fe4da558ca4f003964d4ae60ff70bc9
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | Change-Id: I0f1262774dcbc5e8abd638da9a7411aa9300d53a
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: Ieb05ddae6d0675c8ad97e3851e231d8457a1c4e8
| | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-191-0/+20
| |/ | | | | | | | | | | | | | | + d76117604a9e04a9a66c0279687cc7dc54b9dc68 Doc: Add missing documentation for styleData.role in itemDelegate + cf957e407030fc260bd86882cf2f79724126abdd Bump version Change-Id: I26561264674a30970335d571acd0d8b61f3d8382 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Insert before next item when it existsAllan Sandfeld Jensen2018-12-101-2/+9
| | | | | | | | | | | | | | | | | | | | | | Something is off about the way the last child of previous item is calculated, but we can work-around that by just using the next element when it exist. In the case there isn't a next element, we will hit the fallback in 'last child of previous' and insert at the end anyway. Fixes: QTBUG-66062 Change-Id: Iced69d52c4587434ffdbb09b08b3441289f34eba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Static: Register the base style qml files so they can be foundAndy Shaw2018-12-103-2/+49
| | | | | | | | | | | | | | | | | | | | | | If the files are not registered then it will look for them on the disk instead because it has no entry for them. This changed at some point in the Qt 5.12.0 release but has technically been wrong for some time as they should always be registered. Change-Id: I8246a4f5fb4d94ebc5f7ca262d1821a409eb6c9f Fixes: QTBUG-72338 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Static: Install the qmldir for the Styles moduleAndy Shaw2018-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mention qmldir in AUX_QML_FILES to ensure that it is always copied to the build directory. qml_module.prf usually takes care of this by having QML_FILES in qmldir.files with INSTALLS += qmldir, but with CONFIG += builtin_resources (set for static) that's not the case. AUX_QML_FILES is the correct variable though. Task-number: QTBUG-67644 Change-Id: I6cf580586dec0bf7b44c89b95134d7d7f683102e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into ↵Qt Forward Merge Bot2018-12-053-2/+29
|\ \ | | | | | | | | | refs/staging/5.12
| * \ Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-053-2/+29
| |\ \ | | | | | | | | | | | | Change-Id: I253bdcb4f9847a73165196599341dab03e291fc1
| | * | Fix button menus not opening on the second attemptv5.12.0-rc2v5.12.05.12.0Mitch Curtis2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assign a parent to the QQmlComponent returned by QQuickControlSettings1::styleComponent() so that it doesn't get garbage collected by the QML engine. This was not an issue until 5.12, but it seems like a good idea regardless. Change-Id: I53265b23afab62e2276fe6e10d976a93a4f12e6f Fixes: QTBUG-71238 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Doc: Ignore WinRT-specific qml files from the documentation buildv5.12.0-rc1Topi Reinio2018-11-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files contain no documentation and cause conflicts with documentation sources that actually try to document them. Task-number: QTBUG-71174 Change-Id: I7382a1e05bed2070c45a4234cc3389a02922cdbf Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Add changes file for Qt 5.12.0v5.12.0-beta4Antti Kokko2018-10-311-0/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia703f49cf0218087a7b51a63d1a86423573ed62d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | QQuickTreeModelAdaptor1: fix out of range issue in selectionForRowRangeSamuel Gaist2018-12-051-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the index of the "to" row is invalid and the one from the "from" row is good, then the method will try to access an invalid index. This patch fixes that by ensuring that if the "to" row is invalid (when, for example, the mouse cursor goes out of the view while multiple selection is activated), the "to" index used stays valid. [ChangeLog][Controls][QQuickTreeModelAdaptor1] Fixed an issue where an invalid access was done if either extended or multiple selection was in use and the mouse went out of the view on top of the model. Fixes: QTBUG-71789 Change-Id: I32d8a20ee9ffc1c40584f17c27ceb06d48b81ff0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Unskip test of fixed bugAllan Sandfeld Jensen2018-11-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Was never unskipped after being fixed Task-number: QTBUG-47523 Change-Id: Ibb193b45a73ca627ab3db7db8d1bf7b98f9ee8b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Liang Qi2018-11-160-0/+0
|\ \ \ | | | | | | | | | | | | refs/staging/5.12
| * \ \ Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icfa31ff7f17842b66eac89863e016b1a96eccc36
| | * | Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0947415f129a3076d8d69b8f47cb0e55968291bc
* | | | TableView: Handle dynamic insertion of TableViewColumns correctlyAndy Shaw2018-11-163-0/+101
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When inserting a TableViewColumn after the TableView is created, then it needs to be inserted into the list of columns at the specified index so that it responds correctly to things like resizeColumnsToContents() Fixes: QTBUG-58594 Change-Id: If7ff545306fe8b6616d8e016eb87e565ed40c836 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Refine startup benchmark termination conditionSimon Hausmann2018-10-313-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a timer to terminate the benchmark, let's terminate the benchmark after we've sent off the first rendered frame. This is a bit more realistic, although it doesn't change numbers on my machine. Change-Id: I9a3724ecf781191d2b4dd937a5b74960a19550df Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | Improve startup benchmarkSimon Hausmann2018-10-311-15/+15
| |/ |/| | | | | | | | | | | | | | | Don't measure the time it takes to destruct the QQmlEngine, as that may be heavy work due to the last sweep of the garbage collector heap and deleting all engine-owned QObjects. Change-Id: Ibdd3d92e306d0418ee7080077b8894950878ec43 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Doc: Document Qt Quick Controls explicitly as 'version 1'Venugopal Shivashankar2018-10-2615-128/+131
| | | | | | | | | | | | | | | | | | This is to explicitly identify Qt Quick Controls as Controls 1, so that Controls 2 can be referred generally as Qt Quick Controls. Task-number: QTBUG-70333 Change-Id: I798c0354ad47ab96978575829322a254876529fb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3Qt Forward Merge Bot2018-10-131-0/+1
|\ \ | |/ | | | | Change-Id: I7986808ea6b61f4d500e678968e1ce706518636f
| * Doc: Add missing documentation for styleData.role in itemDelegateAndy Shaw2018-10-121-0/+1
| | | | | | | | | | Change-Id: Ie3f95fd97dae39bf9248898c97d0500feebf5014 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix build when filedialog feature is disabledv5.12.0-beta2v5.12.0-beta1Eskil Abrahamsen Blomfeldt2018-10-011-2/+4
| | | | | | | | | | | | | | | | When the filedialog feature is disabled, we cannot include the headers for it, so we move the include into the #if block instead. Change-Id: I7b3556b570b8e7bd4aaed0ed8b1a0f4195b78975 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Menu: Provide a safe clear() functionUlf Hermann2018-09-272-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | The menu items are generally owned by QML. Therefore we cannot delete them on clear(). The containers, however, are owned by the menu, and we have to delete them also when clearing the QQmlListProperty for a proxy menu. The QQmlListProperty, when clearing the items for a non-proxy menu, will still delete them, as that seems to be the way QML expresses its desire to get rid of them. Fixes: QTBUG-64464 Change-Id: Ied0b86496b289c2e2a83f3d6fd53d7045929beb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ScrollView: Defer calls to doLayout()Ulf Hermann2018-09-262-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doLayout() updates the dimensions of the scroll view, and therefore can trigger the scroll bars to be shown or hidden. That, in turn, can trigger another call to doLayout(), resulting in binding loops. Avoid those by deferring the call. The scrollview tests are broken without this change because the binding loop prevents the scrollbars from being shown or hidden in some cases. The deferring necessitates a tryVerify(), but fixes the actual tests. Change-Id: I0dac0ba380240e025237f69c4d357d764a535c3d Fixes: QTBUG-50605 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\ \ | |/ | | | | Change-Id: If00435cb92fac2eaed1345cb28b4d1adfd25f69d
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Ie0ff57735319c46735f9bbe371fcc729cb14c4b4
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I638c5ce94d36a52f13e2f836c8536e9413d82cf5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id5ab00e39bb4a00fa9c17a02cf3db8c6b73a5650
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Icbedc5cfd480bf0596802e51d242edd1cd4ba416
* | Fix replace transition of vertical slide in the stack viewSimon Hausmann2018-07-031-1/+1
| | | | | | | | | | | | | | | | | | The replaceTransition property was on the wrong level. Thanks to Markus Weingarten for noticing :) Task-number: QTBUG-69251 Change-Id: I4b9f66721c74a29c265d07a3e70747c69b6522ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dialogs: allow preventing processing of standard buttonsAlberto Mardegan2018-06-294-15/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an actionChosen() signal to DefaultDialogWrapper, allowing the developer to stop further processing of the event by setting the "accepted" field to false. This is especially useful when some validation on the dialog contents need to take place before the dialog can be accepted. [ChangeLog][Dialogs] Add a signal to the Dialog class to allow the client to intercept the button presses and optionally prevent further processing of the event. This allows performing some validation on the fields before dismissing the dialog. Task-number: QTBUG-69095 Change-Id: I19bca0bd9fcbafc72d337a5870776a96634ba748 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-2324-26/+26
|\ \ | |/ | | | | Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
| * Doc: Add missing dots (qtquickcontrols)Paul Wicking2018-06-1924-26/+26
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I3731b82ecae0a43878b694e681300bef7c36ea62 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-045-6/+69
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I542d108313b1d1566875aed2905ed6b92b9288f0
| * Add changes file for Qt 5.9.6v5.11.15.11.1Antti Kokko2018-06-041-0/+24
| | | | | | | | | | | | | | Change-Id: I4e63ed249202b9dc07009439971680b417150312 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> (cherry picked from commit ca6bba7163850222ea8b71dd7db9c70de56a0d4e) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+39
| | | | | | | | | | | | | | Change-Id: Id04d03abdf798c7a9ba0c9732500e3330ec6cb3a Reviewed-by: J-P Nurmi <jpnurmi@qt.io> (cherry picked from commit f050a32a4392628ee3e2cb5afe4dbdc792dc05c2) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I6c7cfd038869ae701b7543142ba1516f205d52e6
| * Extras: fix remaining createRadialGradient() issuesMitch Curtis2018-05-293-6/+6
| | | | | | | | | | | | | | | | | | | | be4c4877b35ad1b6983cf194e61f0dad1d123af5 fixed Context2D's createRadialGradient() function, so our usage of it has to be updated accordingly. This patch produces the same visual result as it was originally. Change-Id: I4c021dcb2db9303d0a4d6ae8ca4cc606ca1f6d67 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-262-14/+1
|\ \ | |/ | | | | Change-Id: Ie706f27a0c43ec1d1136310fba196d9b41a184ed
| * StatusIndicatorStyle: fix usage of ctx.createRadialGradient()Mitch Curtis2018-05-242-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | be4c4877b35ad1b6983cf194e61f0dad1d123af5 fixed Context2D's createRadialGradient() function, so our usage of it has to be updated accordingly. This patch results in the same visual result as it was originally (before the auto test failure). Task-number: QTBUG-68301 Change-Id: Ibd8aa24e84ceecccf25d7656350738a38cd03e24 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Unblacklist tst_tumblerMitch Curtis2018-05-221-7/+0
| | | | | | | | | | | | | | | | | | | | The issue that was causing the tests to fail was most likey fixed by 12d80048. 41669ca6 unblacklisted other tests that were fixed by the that commit. Task-number: QTBUG-46393 Change-Id: Ib81e7b1afe0a60961c0b8ad3201802389c7bab01 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-191-0/+7
|\ \ | |/ | | | | Change-Id: I4194dd92ef851407e667bd1c635367a1bae97480
| * Temporarily blacklist tst_statusindicatorMitch Curtis2018-05-161-0/+7
| | | | | | | | | | | | | | | | | | The test seems to have started failing due to high DPI issues, but until the root cause has been found, unblock CI. Task-number: QTBUG-68301 Change-Id: Ia800eb2b568ee0abd35937e436b213321d035290 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+44
|\ \ | |/ | | | | Change-Id: I4c8683beb3ab44c849df357970f8d989a7ca3240
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+44
| |\ | | | | | | | | | Change-Id: I7b811e7ce791f9b9a9d0e97bd2b23b22c959404d
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-251-0/+44
| |/ | | | | | | | | Change-Id: I0d0b64705c2f521e34760ea9992dab92eea571a7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-277-58/+4
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ieb67edec480eba18cdad29f39b262cfb8839bf8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
View Lorry Controller Status