summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Re-enable tst_splitview for other targets than qemuSami Nurmenniemi2017-12-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Test was skipped for all the targets when it should only be skipped on offscreen platform. Task-number: QTBUG-65307 Change-Id: Id6ef2aefcf885447d4529caecdaf3514e52b3ebd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Skip test failing because of qemu crashSami Nurmenniemi2017-12-1912-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of tests fail when qemu crashes with output: "tb_lock: Assertion `!have_tb_lock' failed." These need to be fixed with QTBUG-65211. Task-number: QTBUG-65307 Change-Id: I7d7249d2e7c9a18d10e15a6e79f34dc1ec93e5d6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-1819-114/+379
|\ \ \ | |/ / | | | | | | Change-Id: Ie66ca17fe8ea49b3637accb468e206657346f4ab
| * | Tests_Slider::test_mouseWheel(): use fixed handle sizeMitch Curtis2017-12-181-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default handle size is based off the height of text on the system that the test is run on. By making the size fixed, we remove the possibility for small differences in compare results. Task-number: QTBUG-65224 Change-Id: I14061a028360340c6b284fb450bf1252014dc9b2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-1512-47/+165
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If27d9c3cbc17765c4180651189c4b8d19b8409da
| | * Calendar: fix bug when NaN is displayed instead of dateOleg Yadrov2017-12-157-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I fixed a similar issue last year on the JavaScript side: 094ad30c94a72784449f43ef06d2172d644ab0fd At this time the same thing has been happening in C++. See QTBUG-54559 and the patch for a detailed explanation of the issue. In short, the problem with Calendar is that internally it uses QDate which does not keep information about time, whereas in the JavaScript world date is always combined with time. So, QDate(2017-10-15) is valid, but when during QDate -> JS Date transformation we add time to it (which defaults to midnight (00:00)), it becomes invalid in time zones where the Daylight Saving Time -> Standard Time transition takes place at midnight. To avoid switching the entire QQuickCalendarModel1 to using QDateTime, I modified its date(...) and dateAt(...) methods to return QDateTime with the time part always set to 12:00. That transformation required more changes in QQuickRangedDate1, because Calendar::selectedDate internally is QQuickRangedDate1::selectedDate, and I also had to fix "selected" property binding in the Base Calendar Style as it did take into account the time part of the date, which resulted in wrong behavior with my changes. Task-number: QTBUG-64068 Change-Id: Ia2f7703ff4e5811ef79438c97739da1d8001a7f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I61f110cfa07ed4b809357e9d340893c63f634d31
| | * Fix ScrollView scrollbar handles when there is no contentJoni Poikelin2017-11-281-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-64052 Change-Id: I047255d90ee5f807d2b7b5567aa6559fa8c08499 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | * Merge "Merge remote-tracking branch 'origin/5.9.3' into 5.9" into ↵Liang Qi2017-11-231-0/+26
| | |\ | | | | | | | | | | | | refs/staging/5.9
| | | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+26
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ic73d7fbe14780afcfe0a9256b0055e62314c72bb
| | * | | ScrollView: fix cyclic Tab navigationAlberto Mardegan2017-11-233-1/+87
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ScrollView is not a control widget, which should be included in the focus chain when the user presses the Tab key; instead, it's a container and as such it should not interfere with the navigation. We also modify TableView, because it derives from ScrollView but we want to keep its current behavior. Task-number: QTBUG-64596 Change-Id: Ibd7833603d38171693b2f34c5859e9c4615b8ed4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Pick the default style name at runtime instead of compile timeJake Petroules2017-11-211-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of a naïve OS-based compile time check, we check which platform plugin is in use at runtime. This should give a more accurate mapping, especially on desktop OSes using alternative platform plugins where the Desktop style is not useful. The minimum Android SDK version is 16 now, so the check is removed. Change-Id: Ie7af3a8ce5fd031256f5eba9706f24ab50a23bf9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * | | Update plugins.qmltypesMitch Curtis2017-12-111-43/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hopefully allows Qt Quick Designer to see Calendar's new locale property that was added in d13e4db9d74aefc0bd08ca946b789155a11361fb. Change-Id: I40d9e85228fefcd171b21d13fcdd775b3f1a4692 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-084-19/+71
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I81e56b18d07156e987cfad5b185fc365b2c745b8
| | * | | Fix tst_comboboxv5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0J-P Nurmi2017-11-231-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I5b4803ba49db0ab7e1b4dd632a34d51af59bbf91 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+26
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I7b85d1880a9e8da1718cecc813843273115faa70
| | | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0bb47679d9d1985a42ec769f58067e63015fefa3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
View Lorry Controller Status