summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | 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>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-0818-154/+150
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ifa402a8e38d03d572303fed9fca71b660aa03e27
| * | | 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>
* | | Fix FileDialog not working with UNC pathsMiguel Costa2018-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Excluded from the Windows build a fixup for QUrl's containing too many leading '/'. The fixup was applied on calls to setFolder(const QUrl &f). It was mangling UNC (i.e. network) paths in Windows, causing QQuickFileDialog to reject them. The fixup was introduced in: 48c4c010095e851da3e58ac98514e29dff2e1262 Fixes: QTBUG-67932 Change-Id: Iaab98da9f014156c1d763a57b60ecad41be2e77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-161-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ie6366c9eedf251bd26a1901fddcb10b71777035e
| * | 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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: If157ac85d9d68c005e64a64ce205da65908be405
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-025-43/+84
|\ \ \ | |/ / | | | | | | Change-Id: Ibb1d26d59fb131e9fbdbcdd4a9009e96f0cb10a9
| * | 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.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\ \ \ | |/ / | | | | | | Change-Id: If833670c9dc5bfee1dc3c88c9b78bd3736ff08ab
| * | 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>
* | | Fix feature dependenciesValentin Fokin2018-08-281-0/+9
|/ / | | | | | | | | | | | | | | | | | | | | Add missing guards for header includes: 07490d56 Fix feature dependencies This also fixes build with -no-feature-action configuration. Change-Id: I2deb2dda19104bfa2c28f02617729f57da52c2d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-185-5/+80
|\ \ | |/ | | | | Change-Id: I00b66b03717563bb700f8a73c3bc295a55ac8c6a
| * Slider: don't break the binding on value when using the mouse wheelAndy Shaw2018-04-172-2/+35
| | | | | | | | | | | | | | | | | | When the wheel was used it could cause any binding on value to be broken since it was updated directly. Going via range.position ensures this is not the case. Change-Id: Ic041ea911cee68de34f5c4e184cf8460f5e002da Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Stop incrementing if the mouse is no longer over the buttonAndy Shaw2018-04-172-2/+42
| | | | | | | | | | Change-Id: Ibc95b14faaa77f200cf6ea5e05cb227e6a3628ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * iOS: Be more explicit about how to get access to the native image pickerAndy Shaw2018-04-161-1/+3
| | | | | | | | | | Change-Id: I24c265698d118544a470ac91c54d57895544a5ac Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-073-3/+3
|\ \ | |/ | | | | Change-Id: I8272137b2bacbb2c446c3b426d864e946261e4fb
| * Do not treat winrt as touch based mobile platformv5.11.0-beta4Oliver Wolff2018-04-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While winrt used to be a touch based, mobile platform before, focus has shifted. Widgets were supported from the start and while they are not the main area of focus, disallowing widget dialogs is not the right approach here. Furthermore the current logic of whether widget dialogs should be registered does not work on winrt. The parts containing widgets either have to be removed completely or bound to the same specific conditions everywhere. The mix of setting "no_desktop" and not having widget dialogs unconditionally for "mobile platforms", but then doing additional checks when registering widget dialog types breaks the concept at least for winrt. Task-number: QTBUG-67144 Change-Id: I36fc5b6f8729bbd128faf1de95fc0bba297ab0e9 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-242-4/+0
|\ \ | |/ | | | | Change-Id: I9edca09bd64ca1e35f649518f201b15821f763b9
| * Fix detected anchors on an item that is managed by a layoutv5.11.0-beta3Paolo Angelelli2018-03-222-4/+0
| | | | | | | | | | Change-Id: Ie1f493eef4b597a447d0dc47e9ab383a8fa7fe88 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-139-52/+52
|\ \ | |/ | | | | Change-Id: Ieb311191b4af384a81673b5ed69c32b3b9853c9c
View Lorry Controller Status