summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Doc: Add missing dots (qtquickcontrols)Paul Wicking2018-06-1923-25/+25
| | | | | | Task-number: QTBUG-68933 Change-Id: I3731b82ecae0a43878b694e681300bef7c36ea62 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Extras: fix remaining createRadialGradient() issuesMitch Curtis2018-05-292-5/+5
| | | | | | | | | | 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-241-1/+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>
* Slider: don't break the binding on value when using the mouse wheelAndy Shaw2018-04-171-2/+2
| | | | | | | | | 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-171-2/+4
| | | | | 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-052-2/+2
| | | | | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1Liang Qi2018-02-181-1/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3c4c27d0942058c8d8c325f92688675c14887a4b
| * 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' into 5.11Liang Qi2018-02-124-4/+32
|\ \ | | | | | | | | | Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
| * | Calendar: make clicked(date) emit the correct date5.10Mitch Curtis2018-02-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-023-1/+27
| |\ \ | | |/ | | | | | | Change-Id: I556a8404b908c15eaa71b009319c7f27274b40f1
| | * 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-208-14/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id56429b283aff90a18576cbd769b96fa1f0781fa
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-198-14/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 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>
| | * 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>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-1811-82/+185
|\ \ \ | |/ / | | | | | | Change-Id: Ie66ca17fe8ea49b3637accb468e206657346f4ab
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-159-39/+55
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If27d9c3cbc17765c4180651189c4b8d19b8409da
| | * Calendar: fix bug when NaN is displayed instead of dateOleg Yadrov2017-12-155-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * 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>
| | * ScrollView: fix cyclic Tab navigationAlberto Mardegan2017-11-232-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 5.10 into 5.10.0Oswald Buddenhagen2017-11-201-0/+1
| |\ \ | | | | | | | | | | | | Change-Id: I4212b960f262c29cce78cc482ea966d0c0240653
| * | | 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>
* | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-0111-7/+98
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Iadff14f78c9d4b5aca9cba8a2728c10b7963d8fc
| * | | 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>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-302-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
| | * Update slider handle position when maximum changesFrederik Gladhorn2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * 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>
| * | Doc: add documentation to Dashboard examplev5.10.0-beta2Nico Vertriest2017-10-111-1/+36
| | | | | | | | | | | | | | | | | | 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-175-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][FileDialog] Added defaultSuffix property Task-number: QTBUG-39230 Change-Id: I7dc73c332ad62129d7158b6f6f5a614b8582ffbc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Fix typoFrederik Gladhorn2017-10-101-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I0c4e60c01ca6aeedecb805cf0e82b9a80c632678 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Yulong Bai <yulong.bai@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-262-2/+2
| | | | | | | | | | | | | | | Change-Id: I43296a94e6242a9e77039a0369e3a2292891fec7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-227-30/+30
|/ / | | | | | | | | Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-152-3/+13
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icfa0daf5e65337745f5986afee7cd3c8043fafa0
| * Calendar: add a doc example that sets minimum/maximumDateMitch Curtis2017-08-111-0/+7
| | | | | | | | | | | | Change-Id: Ie2fb915a927d4c3481afa6e4ac64089440f7ac9c Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Convert features.tooltip to QT_CONFIGStephan Binner2017-06-271-3/+6
| | | | | | | | | | Change-Id: I4638457a51a72666b4c73130f4a856ad93ca2f13 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-2717-215/+240
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
View Lorry Controller Status