aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QQuickAbstractButton: make the press point available via private APIJ-P Nurmi2016-07-114-18/+36
| | | | | | | | | | | | The Material style ripple effect needs it to be able to anchor waves at the press point. Export QQuickAbstractButtonPrivate to make it accessible, and update the press point before emitting pressedChanged() since that's what the ripple effect reacts to. Press point dependent ripple effects follow in separate commits. Change-Id: I63eb51eeabcbeb307dea9d0b1731bdb51b518ec7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Popup: expose flip APIJ-P Nurmi2016-07-095-4/+72
| | | | | | | | | [ChangeLog][Popup] Added allowVerticalFlip and allowHorizontalFlip properties to control whether flipping is allowed to fit a popup inside the window. Change-Id: Id14a8846a1e2d07e98207da7c2b2765c202dbaf9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devJ-P Nurmi2016-07-097-11/+53
|\
| * Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-097-11/+53
| |\ | | | | | | | | | Change-Id: Ifff470774347041d1638fb1da277a8cc11a00db6
| | * SwipeDelegate: only consume child events if we grabbed the mouseMitch Curtis2016-07-081-5/+7
| | | | | | | | | | | | | | | | | | Change-Id: Ie808d06824e3bbdb36111625fbb5c59ee9d4e2a4 Task-number: QTBUG-54648 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Doc: fix typo in AbstractButton::pressAndHold()J-P Nurmi2016-07-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I185e5b4effdcbb63829ebd596ec51706244b83ba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: missing signals in MonthGridJ-P Nurmi2016-07-081-0/+24
| | | | | | | | | | | | | | | Change-Id: I1efa6da9ededb87d9629a0f7b1ea53487e4a6bcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: fix custom PageIndicator snippetJ-P Nurmi2016-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use an explicit ID to reference PageIndicator::currentIndex. It happens to work without an ID when PageIndicator is in its own file, but not when customized inline in a tree of other objects. Change-Id: I3e6a6e63373b44771737271479c044fdcc0a470a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Drawer: reposition when closedJ-P Nurmi2016-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | A drawer must be repositioned even when closed, or else it will peek out when anchored to the right or bottom edge and the window is resized. Change-Id: Idf86ec1d841cfcc333eb6c69d07b3e4b2b4015da Task-number: QTBUG-54578 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Fix QQuickComboBox::textAt()J-P Nurmi2016-07-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQmlObjectModel::object() increases the reference count, and must be paired with QQmlObjectModel::release() to decrease the reference count when the object reference is no longer needed. When ComboBox model changed, previously created delegate instances weren't released as appropriate, because their reference counts were non-zero. Change-Id: I55d67b8baf3c00c1236155b1196a958b6db79e28 Task-number: QTBUG-54573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Improve ToolTip documentationMitch Curtis2016-07-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Link to "Delay and Timeout" section from property docs so that users can easily learn more about these. - Be more consistent with wording. Change-Id: I70ad8eb2cda43d6faac0b322fc32be61ea3696df Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Material: implement the ripple effectJ-P Nurmi2016-07-099-76/+532
|/ / | | | | | | | | | | | | | | | | | | | | Consequently, the controls that were previously using the old Ripple type have now gained hover effects (when hoverEnabled: true). The rest of the Material style controls will be adjusted to use the ripple effect in follow up commits. Task-number: QTBUG-50003 Change-Id: I436f3794411fe75de9ccbe3ecda71029130db613 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | qtquickcontrols2plugin.cpp: remove useless double registrationJ-P Nurmi2016-07-081-8/+0
| | | | | | | | | | | | | | | | | | This does not even seem to affect the availability of new properties. It is enough that the types internally import QtQuick.Templates 2.1, which was done in the previous commit. Change-Id: I4b1bce7dc503cc257e3d6483bac4c05b8421995f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-08227-392/+393
| | | | | | | | | | | | | | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Be consistent with naming of event argument in pressAndHold() signalsMitch Curtis2016-07-063-5/+5
| | | | | | | | | | | | | | | | | | | | These were supposed to both be called "event". [ChangeLog][TextField] Aligned the name of the pressAndHold() argument with TextArea Change-Id: Icc55584df37e4de9a9f06af7968bd608e5045c05 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add pressed() and released() signals to TextField and TextAreaMitch Curtis2016-07-066-2/+96
| | | | | | | | | | | | | | | | | | | | | | | | Users need these to e.g. open context menus when editors are right-clicked. [ChangeLog][TextArea][TextField] Added pressed() and released() signals. Change-Id: I32b79a8de0120a4f9115fa1c3cb832aff0134a15 Task-number: QTBUG-51009 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix Tumbler GIFMitch Curtis2016-07-011-0/+0
| | | | | | | | | | | | | | It was too big and had visual artefacts. Change-Id: I650f50f4758891feb39cdbd07b72ef2180e4edb9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Tumbler: make wrap property depend on count by defaultMitch Curtis2016-07-017-126/+356
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes][Tumbler] Changed the default value of wrap to be false when count is less than visibleItemCount. Explicitly setting wrap overrides this behavior. Change-Id: I0089f517a25a606625c245df52b0db5fd859ffc0 Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove DialogButtonBox::flatJ-P Nurmi2016-06-304-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | The Material Design allows mixing standard flat buttons with non-flat custom buttons. It is enough that the delegate provides flat standard buttons by default. It is better to not force all buttons to be flat, but let the user freely specify whether custom buttons are flat. This API has not yet been released, so it is still safe to remove. Change-Id: Iec400553ccefb47f20fb98d64919491d9bb27cbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Universal: implement hover effectsJ-P Nurmi2016-06-3019-47/+100
| | | | | | | | | | | | | | | | [ChangeLog][Universal] Implemented hover effects Task-number: QTBUG-50003 Change-Id: I67d382b0aaef06fc9c16b734f735dcc62262b6f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-06-297-8/+8
|\| | | | | | | Change-Id: Ifd118c11fd6034d03b98c961313280b7098c5f84
| * Universal: fix Dial press effectJ-P Nurmi2016-06-291-1/+1
| | | | | | | | | | | | | | It doesn't have a 'down' property like buttons do. Change-Id: I3b6eb0d0d302914888eccdd76fda886b78a30465 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: fix radiusJ-P Nurmi2016-06-276-7/+7
| | | | | | | | | | | | | | | | There's barely any visual difference, but follow the Material Design specs that use 2dp corner radius. Change-Id: I9f1462eeb89c2462abb07a76949710d11881c4ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: improve the module descriptionsJ-P Nurmi2016-06-292-5/+6
| | | | | | | | | | | | | | | | | | Mention the Qt version that each QML module was introduced in, and emphasize the experimental status of the Qt Labs Calendar module. Qt Labs Platform already does both of these. Change-Id: I103e564b6f7746116a3d40eefb7f2f978e644546 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add hover support to TextArea & TextFieldJ-P Nurmi2016-06-2914-8/+169
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: add missing plugins.qmltypesJ-P Nurmi2016-06-291-0/+293
| | | | | | | | | | Change-Id: I223f19db90f8c1183399831a12e7beaf9923413d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: test and document negative currentIndexMitch Curtis2016-06-282-13/+66
| | | | | | | | | | Change-Id: If56bad7c3dd6dea2898058d6fc5b0d88bcd202fe Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Tumbler: change default visibleItemCount to 5Mitch Curtis2016-06-284-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looks much better than 3; it looks more like an actual Tumbler, partly because the displacement shading is made more visible. This should make it less confusing to interact with for first-time users. In addition, we were previously setting it to 5 in several places. [ChangeLog][Important Behavior Changes][Tumbler] Changed the default value of visibleItemCount to 5 to make it visually clearer that it's a Tumbler. Change-Id: I7c16e05aa73f58e3405caa1826453cb824efae11 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | RangeSlider: add first.hovered and second.hovered propertiesJ-P Nurmi2016-06-284-1/+72
| | | | | | | | | | | | | | | | | | | | | | The actual hover effects are coming in separate patches. [ChangeLog][RangeSlider] Added first.hovered and second.hovered properties that hold whether the respective handles are hovered. Change-Id: I3ffeed5de6c9a168534c8e9d4f1642161fc52caf Task-number: QTBUG-50003 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SpinBox: add up.hovered and down.hovered propertiesJ-P Nurmi2016-06-284-3/+66
| | | | | | | | | | | | | | | | | | | | | | The actual hover effects are coming in separate patches. [ChangeLog][SpinBox] Added up.hovered and down.hovered properties that hold whether the respective buttons are hovered. Task-number: QTBUG-50003 Change-Id: Ie47329e23326f40e4c807703ff7a97437f68deb4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ComboBox: make delegates respect hoverEnabled of the controlJ-P Nurmi2016-06-283-0/+3
| | | | | | | | | | | | | | | | The actual hover effects are coming in separate patches. Task-number: QTBUG-50003 Change-Id: I191cebf299998046a89b5653bd2858f65a7bca34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: add wrap propertyMitch Curtis2016-06-2816-167/+875
| | | | | | | | | | | | | | | | | | [ChangeLog][Tumbler] Added wrap property to control whether or not tumbler wraps when it reaches the top and bottom. Change-Id: I27c543d98f7bc574bc5dc882a130abe0dcc13cea Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add internal QQuickPageLayout helperJ-P Nurmi2016-06-284-117/+289
| | | | | | | | | | | | | | | | Does the header/content/footer layout for Page, and will be shared with the upcoming Dialog. Change-Id: Ic550a87b5f4bb4eb44e2d08a4c977183f3b5bbff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform dialogs: set the options on constructionJ-P Nurmi2016-06-273-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Platform dialogs hold a shared pointer to an options structure. Dialog implementations may access the options in various places (eg. QGtk3FileDialogHelper::selectFile()) and seem to rely that the options are not null at this point. Thus, pass the options pointer right away on construction instead of unnecessarily delaying to applyOptions(), to avoid potential crashes. Change-Id: I14b0801eb58a9834867dd302a6610e64adeea0cd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: add FileDialog and FolderDialogJ-P Nurmi2016-06-2711-0/+1108
| | | | | | | | | | Change-Id: I4328c273e48139d6ddd5a3d3c8492d06f48a5c24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: fix names in Qt Labs Platform docsJ-P Nurmi2016-06-246-7/+7
| | | | | | | | | | | | | | | | OS X -> macOS, GTK -> GTK+ Change-Id: I501bc5bc6d8ecff647f701febb777c5207b593cd Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: fix missing titles for ColorDialog & FontDialogJ-P Nurmi2016-06-242-0/+2
| | | | | | | | | | Change-Id: I9bf88049d4c6c77cbd438398fd13a11c07efc7f3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | qtlabsplatform.qdocconf: add missing qtwidgets dependencyJ-P Nurmi2016-06-241-1/+1
| | | | | | | | | | Change-Id: I205d62325cf3ce2ce16c725752c02762cec877c1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: add MessageDialogJ-P Nurmi2016-06-229-0/+526
| | | | | | | | | | Change-Id: I89f67fa4f620dc81dd9e7fe848f37ea5c12d5db7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | ColorDialog & FontDialog: use widgets as a fallbackJ-P Nurmi2016-06-229-2/+509
| | | | | | | | | | | | | | | | | | | | | | | | This makes these dialogs available on Windows and KDE. One more reason to keep the module experimental. In the long run, platforms should implement QPA dialogs so that we can remove the undesired dependency. Also simple instance creation tests are included to make sure it won't crash with non-QApplication apps. Change-Id: Ib4dabe7b656a1aa1f114052a3f57c9b1232ff27f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SystemTrayIcon: use widgets as a fallbackJ-P Nurmi2016-06-224-3/+223
| | | | | | | | | | | | | | | | | | | | This makes system tray icons available on Windows and KDE. One more reason to keep the module experimental. In the long run, platforms should implement QPA system trays so that we can remove the undesired dependency. Change-Id: Ibc30f881525cd14091affc996104c65310c0a13e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Menu & MenuItem: use widgets as a fallbackJ-P Nurmi2016-06-2210-1/+655
| | | | | | | | | | | | | | | | | | This makes context menus available on Windows and KDE. One more reason to keep the module experimental. In the long run, platforms should implement QPA menus so that we can remove the undesired dependency. Change-Id: Ifd2d1e92512a05a95d3e7e7e7c00d712e06ce0cb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Migrate to new scenegraphng APILaszlo Agocs2016-06-227-77/+56
| | | | | | | | | | | | Change-Id: I9b0c05edacd4e6f1be6f692e77476097d1f99bc0 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add SwipeView::interactiveJ-P Nurmi2016-06-224-0/+38
| | | | | | | | | | | | | | | | | | [ChangeLog][SwipeView] Added interactive property for controlling whether swipe interaction is enabled. Task-number: QTBUG-54268 Change-Id: I1f03e4958defe52c8a15c808567424c85f07f8bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make import version 2.1 available for Material & UniversalJ-P Nurmi2016-06-212-0/+2
| | | | | | | | | | Change-Id: Ia3ab14fdb67e32907396329ab9034a429c7b536e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Reorganize templates & calendar docsJ-P Nurmi2016-06-215-3/+5
| | | | | | | | | | Change-Id: I0e7a20805fe4823564ee2b312a635d08fa978327 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: bump import versions to 2.1J-P Nurmi2016-06-216-7/+7
| | | | | | | | | | Change-Id: Ia7a1ed2df09c58d052e67a611c3fd18f1d188dc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: move the basic example snippet to gettingstarted.qdocJ-P Nurmi2016-06-212-44/+16
| | | | | | | | | | Change-Id: Id6e80f4966f164bd767fe0c0930665015205745e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-06-209-179/+130
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickcontainer.cpp Change-Id: I7c41619a81b4fdd0d8ccaa4f0bb489a9b84e3865
| * Make Material style SpinBox text respect enabled stateMitch Curtis2016-06-201-1/+1
| | | | | | | | | | | | Task-number: QTBUG-54207 Change-Id: Ic4a871147bde046d402dac1fe25913abfa8da0ba Reviewed-by: J-P Nurmi <jpnurmi@qt.io>