summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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
* | 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>
| * | | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-202-2/+1
| |\ \ \ | |/ / / |/| | | | | | | Change-Id: I4212b960f262c29cce78cc482ea966d0c0240653
* | | | test: enable Tests_TableView::test_resize_columns() on b2qtSami Nurmenniemi2017-11-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test was fixed by commit c84f7554894cef0cbeeba8a61f441286e190a797 in qtbase. Task-number: QTBUG-64523 Change-Id: I86195fe049c61ceab43566d004c8f6e6bfcee041 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | test: skip Tests_TableView::test_resize_columns() on b2qtLiang Qi2017-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64523 Change-Id: Icc369c1933a725321927f46255bb396800a0ac5d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I89e5f9b74a7657d315334414ea0447f658024841
| * | | Fix base slider style in static buildsLaszlo Agocs2017-11-141-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid errors like ShaderEffect: Failed to read :/QtQuick/Controls/Shaders/blur.vert in static builds. Task-number: QTBUG-64488 Change-Id: I13b8aa0736db68859e0b4539937952f9c4b5b04b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Doc: Maintain the list of highlighted examples locallyTopi Reinio2017-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | | Previously the list was maintained in qtbase. Change-Id: I0510653c08e2e82f949084c5f0e3b1dcae3a81bf Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
| | * Add changes file for Qt 5.10.0Antti Kokko2017-11-101-0/+38
| |/ |/| | | | | | | Change-Id: Ia471d106bdd692fc9afce2e7299e541a9da1c2bd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3011-19/+138
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
| * Fix outdated FDL license headerKai Koehne2017-10-185-15/+65
| | | | | | | | | | Change-Id: I03c222a72490959d55b3077a6282553a4bfcf7d2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update slider handle position when maximum changesFrederik Gladhorn2017-10-102-3/+16
| | | | | | | | | | | | | | | | | | This is exactly the same as the minimum change, when the maximum is changed, the handle position needs to be re-evaluated. Task-number: QTBUG-63354 Change-Id: I13a67451190a3bb7915afe8e89501097c1dd3301 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+31
| |\ | | | | | | | | | Change-Id: I71761b4cacc29dd6c4890e4b3119c6397b77ca60
| | * Add changes file for Qt 5.9.2v5.9.25.9.2Antti Kokko2017-09-261-0/+31
| | | | | | | | | | | | | | | Change-Id: I1bb0e21414a70bb25e19aa3308cbe29cb6396e76 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: Ibc549b14707e19800e0f586228815e6668fe3110
| * | Add missing stdio.h includeJake Petroules2017-09-281-0/+1
| |/ | | | | | | | | Change-Id: I1fac87fd96898fed487f1621c1d1bdc4c44de1cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Check for empty style returned from environmentFriedemann Kleint2017-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | Fix warning "Empty filename passed to function" when running Qt Creator 4.4 against Qt 5.10 (see qtbase: 0dee566e98f5ff4f224e596de1c04de4f9685df4). Change-Id: I0b71a873245a28ef972c105e7d41347e6b0fb38a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Add change file for Qt 5.6.3Jani Heikkinen2017-09-011-0/+24
| | | | | | | | | | | | | | Task-number: QTBUG-62702 Change-Id: I023e298c7fc6a64153f374c718d5fce4af98fa78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Manual test viewinqwidget: Add a TextFieldv5.10.0-beta3Friedemann Kleint2017-10-171-3/+13
| | | | | | | | | | | | | | Allowing for testing menu positioning in addition to combo dropdowns. Change-Id: I0b7ef259a15d8773e82218e1f8a30f15d23e6644 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add documentation to Dashboard examplev5.10.0-beta2Nico Vertriest2017-10-113-7/+46
| | | | | | | | | | | | Task-number: QTBUG-60648 Change-Id: I79b9fdfde18041d95b7aa422bfb4d188ed907589 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Maintain the higlighted examples list locallyVenugopal Shivashankar2017-10-051-0/+3
| | | | | | | | | | | | | | | | The list is currently maintained in qtbase. Task-number: QTBUG-60648 Change-Id: I38ff28e52c1274a6cfaae66ef232e482cff38e53 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Add internal types to Android styles qmldirv5.10.0-beta1Eskil Abrahamsen Blomfeldt2017-09-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for types in a module to be available inside the module itself, but not to external types, they need to be marked as internal in the qmldir. This has worked by accident before, but stopped working after 22a2cc43387ec3b9f74a6c01f8665378a4541147 in qtdeclarative, at which point no Qt Quick Controls applications would run on Android. Note that there is also a change needed in qtdeclarative, in order to support implicit loading of internal types even when there is an explicit import of the module (needed to get access to the singleton). Task-number: QTBUG-63309 Change-Id: I36b9ce9fa8f55c4da1f5e64c8fed120e9913bc85 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add support for the defaultSuffix property in FileDialogAndy Shaw2017-09-176-3/+53
| | | | | | | | | | | | | | | | [ChangeLog][FileDialog] Added defaultSuffix property Task-number: QTBUG-39230 Change-Id: I7dc73c332ad62129d7158b6f6f5a614b8582ffbc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
View Lorry Controller Status