summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.11Kari Oikarinen2018-12-121-1/+1
| | | | Change-Id: I4535c2503b82eebc37d74d918bf45f3ed02eea02
* 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>
* Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | Change-Id: I0947415f129a3076d8d69b8f47cb0e55968291bc
* 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>
* 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>
* Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | Change-Id: Icbedc5cfd480bf0596802e51d242edd1cd4ba416
* 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>
* 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>
* 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>
* 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.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>
* 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>
* 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>
* 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>
* Don't conflict with Qt Quick Controls 2 when using the platform dialogsAndy Shaw2018-03-129-52/+52
| | | | | | Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* extras/gallery example: Use layout alignment in Dial pagev5.11.0-beta2Friedemann Kleint2018-02-261-4/+4
| | | | | | | | | | | | Replace 'anchors' by the 'Layout.alignment' attached property, fixing numerous warnings: qrc:/qml/gallery.qml:137:17: QML Dial: Detected anchors on an item that is part of a layout. This is undefined behavior. qrc:/qml/gallery.qml:151:17: QML Text: Detected anchors on an item that is part of a layout. This is undefined behavior. qrc:/qml/gallery.qml:103:17: QML Dial: Detected anchors on an item that is part of a layout. This is undefined behavior. qrc:/qml/gallery.qml:124:17: QML Text: Detected anchors on an item that is part of a layout. This is undefined behavior. Change-Id: Iaf5b8f16e477ecd8e7598e857de0fc16e7b53d53 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1Liang Qi2018-02-181-1/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3c4c27d0942058c8d8c325f92688675c14887a4b
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: I632fd6276b76e46515921489cbdfcdab9e3dd1c8
| * QQuickMenu1::__popup(): Scale target rectangleJ-P Nurmi2018-02-021-1/+4
| | | | | | | | | | | | | | | | Same as 223c15 for QQC2. The QPlatform* classes operate in native pixels. Task-number: QTBUG-55251 Change-Id: I4a3fa64313a6035dab96906fa57a27240e080678 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: I79fdc7759ea947279b03509b6e9f313c1d9bebb7
| * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | Change-Id: Ia0b7a04cf0cecda63148ea92371e4aa9a53b1fe7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Fix typosJarek Kobus2018-02-132-2/+2
| | | | | | | | | | | | | | | Change-Id: I7425013eb53a9fb5866c748944dda029ce7edd43 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1228-1157/+351
|\ \ \ | | | | | | | | | | | | Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
| * | | Calendar: make clicked(date) emit the correct date5.10Mitch Curtis2018-02-092-3/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calendar was implemented in such a way that pressing on a date selects that date, rather than releasing or clicking. With the current code, this presents issues when the month changes as a result of the press. For example, clicking on a date in an adjacent month will result in the clicked() signal passing the date under the mouse in the new month, instead of the originally pressed date. This patches fixes the issue by storing the pressed date and using it when emitting the released() and clicked() signals. Task-number: QTBUG-54129 Change-Id: I0c16293033b77f6ae783b5365d198b4a516af90b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-0226-1154/+336
| |\ \ | | |/ | | | | | | Change-Id: I556a8404b908c15eaa71b009319c7f27274b40f1
| | * Remove unused license filesKai Koehne2018-01-243-1153/+0
| | | | | | | | | | | | | | | Change-Id: Id8ce9f444063a7841f2e82b9f49ec843b7f56ac7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add creation benchmarks for qmlbenchJ-P Nurmi2018-01-2220-0/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmlbench repo has benchmarks only for a subset of QQC2. 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 many QQC1 types. However, for our own benchmarking purposes it is useful to be able to easily benchmark these types. Change-Id: I9124791a93f07346dc80f1f08aedd655ed0cfa02 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Document licensesKai Koehne2018-01-223-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Every module should state the licenses it is available under in it's landing page. Change-Id: Ib2d5f49e57f7f34bf06a558725dcb53152561f8d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Fix memory leak in QQC1Simon Hausmann2018-02-073-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When repeatedly creating a QQuickView, loading a QML file that imports QQC1 and deleting the view again, we would leak memory that was allocated as a consequence of QML type registration in initializeEngine() callbacks that were called on every iteration. After the limitation of namespacing in the registerTypes() callback of QML module plugins has been lifted, we can move the type registrations into registerTypes() where they belong and which is called only once. Change-Id: I1d21b18dd060e169a1ee1095f5c5af7341443492 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-2010-32/+72
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id56429b283aff90a18576cbd769b96fa1f0781fa
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-1910-32/+72
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/dialogs/qquickabstractfiledialog_p.h tests/auto/controls/data/tst_combobox.qml Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
| | * Doc: Change wording on when module was introducedKai Koehne2018-01-193-3/+3
| | | | | | | | | | | | | | | | | | | | | Change to past tense. Change-Id: I623ecbf4586b9212ceba5be15f18b0946b2de884 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Fix DefaultFileDialog binding loop warningsMitch Curtis2018-01-152-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove change signals from the shortcuts and __shortcuts properties, as they don't change after being populated for the first time. Task-number: QTBUG-53707 Change-Id: If305a6d63ebd98e6082fc5b7d89a63aaab6c1f43 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Dialogs: Fix minor memory leak in QQuickAbstractDialogJarkko Koivikko2018-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Dialogs decoration component is not an Item based object, there is a minor memory leak in error cleanup path, causing the object to leak. Change-Id: I79295378303e460ad0024d5994fed28ddd37b591 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
| | * Fix tst_comboboxJ-P Nurmi2018-01-071-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bogus timer firing once after the test had been running 500 ms. The timer was supposed to be used as a workaround on Mac, but since it had running set to true, it was actually firing once on all platforms. The timer was originally added in 6254af5. The test function ended up being skipped on Mac, so the timer was actually pointless. Task-number: QTBUG-64664 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit a749525164b771452599e67e277d2ea6b3866479) Change-Id: Icebda05c872ba2de690e87bd0a9968670f203ce2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-051-0/+44
| | | | | | | | | | | | | | | | | | Change-Id: I9303f0747aec1b9ec296bd05f74ef934d75e5d8c Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * TreeView: avoid skipping some tests now that it has touchscreen supportShawn Rutledge2018-01-021-18/+0
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-47243 Change-Id: I19d06df099a9da253059d2d0aa4a290b41a17ada Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * TreeView: allow selecting items by touchShawn Rutledge2017-12-271-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only single items can be selected via an actual touchscreen, because the keyboard modifiers are not accessible in a mouse event synthesized from touch. With a mouse, if the system has a touchscreen, then selections done by consecutive clicking (with or without modifiers) will work, whereas dragging across a consecutive range will not work because dragging is the same as flicking. But on systems which do not have a touchscreen at all, the behavior is the same as before. Task-number: QTBUG-47243 Change-Id: Ib0fa1a75592b982fe93da46f0c2e3018219947d0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * TableView: Don't unset the delegate loader source componentUlf Hermann2017-12-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once we've loaded the delegate, we want to keep it. Constantly deleting and recreating items is rather wasteful. The items could already be moved to a different location before, so keeping them around when the item is completely disabled doesn't make much of a difference. We do retain the behavior of only instantiating the delegate once we add it to the table, though. Change-Id: Ic3cd016bc6990f0a9695b5aeb0d1de3aad0f4ca1 Task-number: QTBUG-62809 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Louis du Verdier <louis.du.verdier@free.fr>
| * | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I4e552e152f426d653058bf004544b2a88b9f3c16
* | | Re-enable skipped testsSami Nurmenniemi2018-01-0812-55/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QtDeclarative was fixed with 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a and tests pass now. Task-number: QTBUG-65521 Change-Id: Ibb88e17a182786f8299a6ab00bd74862aba548ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
View Lorry Controller Status