aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow specifying a relative style path in qtquickcontrols2.confJ-P Nurmi2016-11-303-13/+32
| | | | | | | | | | | | | | | The style path is resolved relative to the location of config file. Even though qtquickcontrols2.conf is normally located in the root of resources, Quick Designer uses QT_QUICK_CONTROLS_CONF to set a custom location for the preview, where the standard config location is not feasible. This patch extends the config and style lookup further by allowing to specify a relative path to a custom style for the Quick Designer preview. Change-Id: Iad9c459421eefbf7a5bcbedfea59f5f16a1d3a39 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix typo in description of qquickcalendar.cppMarco A. Piccolino-Boniforti2016-11-301-1/+1
| | | | | | Change-Id: I7e21c1aeaa205c1dd4e7985837897899e7a39b11 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* SpinBox: fix input method hints to get the appropriate VKBJ-P Nurmi2016-11-293-3/+3
| | | | | | | | SpinBox operates on integers. Task-number: QTBUG-56837 Change-Id: Ib77cded8c4483fa78816d004692cacb3532deedd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Dial: add missing wheel handlingJ-P Nurmi2016-11-293-0/+63
| | | | | | | | [ChangeLog][Controls][Dial] Added support for wheel handling when wheelEnabled is set to true. Change-Id: If0bc2f0ea9d7cde7726739cdfdbd795c908981f0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-287-22/+342
|\ | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc sync.profile Change-Id: I554c40516030075142f9af1dd5c66fdca2b78b9a
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-241-13/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Ie87e9b6e2d976b6ed433a8d747a83cf0d27bed95
| | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-14/+0
| | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Icdcaa7ad856eb493448398f9180ecc4b642262d9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-245-5/+331
| |\ \ | | | | | | | | | | | | Change-Id: I74c00c0b5c36cc96db8bdbd7c1c2a77d6e37d6e7
| | * | Fix popups to close on click outsidev5.7.1J-P Nurmi2016-10-254-5/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup closes itself on press outside, it accepts the press event so that it doesn't propagate to other popups or the content below. We must make sure that such closing popup does not become the mouse grabber, because it doesn't make sense to route the subsequent mouse events to the popup that was just closed. Change-Id: I80c6e26a1d94aa1526a61862f00af2fd0778aa82 Task-number: QTBUG-56697 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Add changes file for 5.7.1Jani Heikkinen2016-10-211-0/+196
| | | | | | | | | | | | | | | | | | | | Change-Id: I713bb793a0c4fe423bc8d27d15e0802e9de5a622 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Doc: clarify the feature comparison tableJ-P Nurmi2016-11-231-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing styles at runtime is not possible in QQC2. Add also footnotes that QQC1 may not provide optimal performance on embedded and mobile. Change-Id: Iea691116eacdcf73482ecd52fd1e9c945a788f9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Doc: refactor the type comparison tableJ-P Nurmi2016-11-251-90/+388
| | | | | | | | | | | | | | | | | | | | Change-Id: I2267dcd15bcbcbdee8708208dc5f92eb69b745d6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Material Drawer: show a separator line when it has no dim nor elevationJ-P Nurmi2016-11-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes a non-dimmed and non-elevated Drawer stand out from the content. Other styles have such separator line always visible. Change-Id: I58a75fbcabcca09248ec4c94ec22338967fbfe87 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Material: fix Drawer to respect Material.elevationJ-P Nurmi2016-11-241-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Iecb9e44fb955ad5dc9a8ddf69b4340108693458f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | SwipeDelegate: fix swipes that begin over a child item of a delegateMitch Curtis2016-11-242-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the mouse was pressed over a child item of the delegate, the event's position will be for that item, rather than the entire control. To fix this, we need to set the correct pressPoint. To avoid duplicating QQuickAbstractButton::mousePressEvent()'s code, we simply set the correct pressPoint after calling it in QQuickSwipeDelegatePrivate::handleMousePressEvent(). Task-number: QTBUG-57271 Change-Id: I7204d6176c755512eeeb0b1a57a920fbab40392c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | qquickmaterialripple_p.h: add missing qcolor.h includeJ-P Nurmi2016-11-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-57297 Change-Id: I6ef977700639472eb87eeceef5f9f4c008d20950 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-237-84/+273
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickswipedelegate_p.h Change-Id: I5446503c1e4f21cb37f4fffeb3453d1c84b54b30
| * | | SwipeDelegate: don't emit clicked when released outsideMitch Curtis2016-11-237-80/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no delegates and hence the mouse hasn't been grabbed, we should clear the pressed state when the mouse is dragged outside the control. We can do so by falling back to the event handling of the base class (QQuickItemDelegate) when we have no delegates. This also ensures that the canceled() signal is emitted. A similar thing is done for controls with delegates, except that only the vertical position of the mouse is checked, as we still want to initiate swipes horizontally. Change-Id: I7738f5b9e8e8b6ce4a733008fa4ff73596e854ea Task-number: QTBUG-56312 Task-number: QTBUG-57285 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Use tryVerify() instead of wait() where possibleMitch Curtis2016-11-222-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may help with the flaky tst_tooltip test, and makes tst_tumbler a little bit cleaner. Task-number: QTBUG-57258 Change-Id: Ida987fb9d60392aba4142e4711131aded56d425d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | SwipeDelegate: fix broken swiping after calling SwipeDelegate.close()Mitch Curtis2016-11-222-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset the internal state when close() is called to ensure that it's consistent. Task-number: QTBUG-57243 Change-Id: Id52724e0eb296c3f8a4fc0a0587a04558b1d1ab6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Overhaul the Contact List example - part IIJ-P Nurmi2016-11-226-137/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the Edit and Remove buttons from the delegate to a context menu that is triggered on press-and-hold. Get rid of a lot of custom font sizes and hardcoded geometries. This ensures that the example looks sensible on all platforms, styles, scale factors, system fonts... Change-Id: If03f917c98b71c93be9292117116e9fa48e3e6fe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | AbstractButton: fix press-and-hold for checkable buttonsJ-P Nurmi2016-11-222-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't toggle the checked state on release after press-and-hold. Change-Id: I06b6a0e86dc02c171eef10f3c0d564ff605796f0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Whitespace fixesJ-P Nurmi2016-11-203-3/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4eab43944ec03b79d713db1c6756e76cbfa38b30 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | qtquickcontrols2-contactlist.qdoc: remove stray image-tagJ-P Nurmi2016-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7c88bfbe8e7d3738302d859e4dafc2d0b5fdfee3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | SwipeDelegate: comment out the revision of swipe.completed()J-P Nurmi2016-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QML engine cannot handle revisioned grouped or attached properties: import QtQuick.Controls 2.1 SwipeDelegate { swipe.onCompleted: { } } => ".onCompleted" is not available due to component versioning." Change-Id: I5bc944aeac7c7f16f482208a523110ccaa42241b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Overhaul the Contact List exampleJ-P Nurmi2016-11-186-89/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some renames, API tweaks, and structural changes. Glue the pieces (view/model/dialog) together in contactlist.qml. Change-Id: Id3a31248b391838c6d39f2f0f355e1c35456ccf5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Contact List: tweak the section headerJ-P Nurmi2016-11-182-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the old-fashioned gradient with a ToolBar. It stands out more than well enough, and is fully style-agnostic. Also, give descriptive IDs for better designer integration/preview. Change-Id: Ib2d4404e3c0fa769ac661645046a25e578f62d37 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Contact List: give the contact dialog focusJ-P Nurmi2016-11-172-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id8d48a42e283e262c44a9f2c64268459a4a11050 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Contact List: add dialog titlesJ-P Nurmi2016-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia842791e28380fd672d3edfe0e6acad0613a64ae Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Contact List: cleanup the list viewJ-P Nurmi2016-11-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No clipping, current index, or x-coordinates needed. Change-Id: Ibfb4a8e1159072a84ee229607b28e7f4010eb925 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Contact List: fix model insertionJ-P Nurmi2016-11-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New contacts must be inserted in alphabetical order so the sections stay sane. Change-Id: I39279bbeb429198b38a2b4da1d76eb50bfab723c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Contact List: simplify the ContactModel gettersJ-P Nurmi2016-11-171-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QList::value() does the boundary checking for us. Change-Id: I6965e6be861da86d35e6f30f74c94ba39e4ad2ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Contact List: rename AddressModel to ContactModelJ-P Nurmi2016-11-178-53/+53
| | | | | | | | | | | | | | | | | | | | Change-Id: I2da41a5d108b5da23dc969d30c50138ef7e42cc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Contact List: cosmetic cleanupJ-P Nurmi2016-11-177-30/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I5782451235269cac8c4e6aaf319a30151cb599ef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Update .gitignoreJ-P Nurmi2016-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib6ebd0d076309f2d22368223bb323547aed33f3a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-1712-185/+309
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_button.qml Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7
| * | | QQuickStyle: kill the temporary QQmlEngine instanceJ-P Nurmi2016-11-171-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The temporary QQmlEngine instance is not only slow and ugly, but also causes random crashes in the CI. This change replaces the temporary QQmlEngine instance with a local defaultImportPathList() helper method, which is based on the code in QQmlImportDatabase constructor. Later on, we can switch to QQmlImportDatabase::defaultImportPathList() when it has been made available in dev. Change-Id: I9f8363ba79ce39fb0482e6e44be0b1d1040c76e4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Doc: a follow-up commit to 'rephase the "logical position" properties'J-P Nurmi2016-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're talking about two quantities, each of which is expressed as a fraction; they are expressed as fractions. Change-Id: I498864376f25d7f432c262d0f0dca27c5878d2bc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | | QQuickSpinBox: fix auto-repeatJ-P Nurmi2016-11-172-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't cancel auto-repeat on the tiniest mouse/touch move, but keep repeating until moved outside the button. The test has been written so that the exact amount of repeats does not matter, as long as it repeats. This is because waits are not reliable in a busy CI environment. Sometimes waits can take longer, timer events get queued, and we get an unexpected burst of repeats. Change-Id: Ibdcdd9e684bbcda032abfabb8a33ed892c7778df Task-number: QTBUG-57085 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | QQuickAbstractButton: fix auto-repeatJ-P Nurmi2016-11-172-34/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't cancel auto-repeat on the tiniest mouse/touch move, but keep repeating until moved outside the button. The test has been changed so that the exact amount of repeats does not matter, as long as it repeats. This is because waits are not reliable in a busy CI environment. Sometimes waits can take longer, timer events get queued, and we get an unexpected burst of repeats. Change-Id: Ic473e04c4d15a0826c8adf460c69507e64590d99 Task-number: QTBUG-57085 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Tests: de-couple SignalSequenceSpy from the testable controlsJ-P Nurmi2016-11-163-134/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows running tests without the signal sequence spy, which expects an exact sequence of signals. It can create problems when combined with wait/tryCompare(), which may take longer than expected in a busy CI environment, and result to unexpected signals. Change-Id: I390aa3ddafed9122deaa822b241b3b9bba7841f6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Doc: rephase the "logical position" propertiesJ-P Nurmi2016-11-165-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous phrasing was poor and somewhat confusing. The logical position is expressed as a fraction of the value, in the range 0-1. Change-Id: I6c2a4cbb1385af69392d214dd02224ec876131e5 Task-number: QTBUG-57069 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Contact List example: replace Qt Quick primitives with ControlsJ-P Nurmi2016-11-174-32/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we get the correct colors when running with different styles. Change-Id: If249f9704fbe157aab1b121cf7d09ee05ab85c14 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Contact List example: make ContactDelegate.ui.qml designableJ-P Nurmi2016-11-171-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the MouseArea and its onClicked signal handler with a checkable AbstractButton to achieve declarative bindings and that way make it possible to open ContactDelegate.ui.qml in Qt Quick Designer. Change-Id: I764e0adc23d4a0d44dd6660ed14e224a4e0e30c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Gallery: improve designer compatibilityJ-P Nurmi2016-11-179-27/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of some unnecessary Math.min/max() calculations, and let the controls just stay at their implicit size. As for the buttons, we can use ColumnLayout + Layout.fillWidth to ensure that they all have the same size. Change-Id: Iaed29b330d7edc1f5d2c05d8815a559d52d52bcc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Gallery: kill some useless pagesJ-P Nurmi2016-11-174-211/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pages for drawer, menu, and popup were pretty useless, because they did not really illustrate how the respective controls are used. They were just opening the side drawer, options menu, and settings dialog from elsewhere in the app. Coincidentally, these pages also contained some imperative signal handlers, which prevents them from being opened in Qt Quick Designer. Change-Id: Iad606c05a1289d22e2f25c28a16581b979a58da6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Adding new example Contact ListThomas Hartmann2016-11-1715-1/+1176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example shows how to integrate a C++ backend without disrupting the tooling. A custom list model is implemented in C++ and registered as a QML type. Change-Id: I958bc38797ef353cdb5ea23ec69ada67e132ced7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Material: de-couple foreground and primaryTextColorJ-P Nurmi2016-11-1626-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to get the ComboBox colors right, it must be possible to query the original primary text color value. It was very convenient to make Material.primaryTextColor return custom Material.foreground colors, because that way we didn't have to touch our QML files, but this approach is no longer usable. Task-number: QTBUG-57167 Change-Id: Iee003e96112b919dc7c84a906e4f5691b0f2a6ab Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Restore AbstractButton::checkableJ-P Nurmi2016-11-168-53/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 7a8f055, we hid the checkable property from QQuickAbstractButton and exposed it only in QQuickButton and QQuickMenuItem. The reasoning was that QQuickCheckBox, QQuickRadioButton, QQuickSwitch and their delegate counterparts are inherently checkable, so having the checkable property available in QML didn't seem to make sense. While this still holds true, there are other factors to take into consideration. AbstractButton is meant to be a generic base class for all types of buttons, but the lack of a checkable property makes it unusable as a base class for custom QML-based checkable buttons. If we want to a hide the checkable property from CheckBox, RadioButton, and Switch to avoid having it popup in the auto-completion list, we can probably do it in a less disruptive way via tooling. [ChangeLog][Controls][AbstractButton] The checkable property has been made accessible from QML. Previously it was only exposed for Button and MenuItem, but it is now available for any AbstractButton to make it possible to create custom QML-based checkable buttons. Task-number: QTBUG-51554 Change-Id: I19e29fc87cd15811c43c9b9ebb29701d66cde72f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-153-4/+13
|\| | | | | | | | | | | | | | | Change-Id: I4a3971034d8e6daf0285c4bc9e5612b5e6cdabf1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 19:51:09 +0000