aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* controls.pri: add $$PWD to QML filesJ-P Nurmi2017-04-201-52/+52
| | | | | | | Align with material.pri & universal.pri Change-Id: I52a63c141b681ccf72d6c1aaf14b1071aacb8106 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickPopup: add touch(Ungrab)Event()J-P Nurmi2017-04-204-0/+26
| | | | | | | | | This is required for now to keep things working when QQuickControl touchEvent() is added. Task-number: QTBUG-58389 Change-Id: I036cc39d96d4876056e01e619163dc1bbcffce74 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickComboBox: handle touch eventsJ-P Nurmi2017-04-192-0/+63
| | | | | | Task-number: QTBUG-58389 Change-Id: I7120d7bce827beb97a9ae3eaf4e99cf6b6e9f209 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Revise QQuickComboBox internalsJ-P Nurmi2017-04-191-7/+39
| | | | | | | | | Move the logic of press/move/release/cancel event handlers into methods in the private class, that can be reused for touch events. Task-number: QTBUG-58389 Change-Id: Ifc587f53975a8ddd5cd8baea52aff259de39876e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-184-3/+30
|\ | | | | | | Change-Id: Ia851f3ac828908ad693f393797e1e2c54bea5eef
| * Material: fix vertical paddings of the DialogButtonBox5.8Nikita Krupenko2017-03-111-2/+3
| | | | | | | | | | | | | | Height of a single-line button box should be 52. Change-Id: I9c65719dcf73f323996e9c687241259f8e6473fa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Material: use proper layout of the buttons in the DialogButtonBoxNikita Krupenko2017-03-103-1/+27
| | | | | | | | | | | | | | | | | | | | Instead of using system button layout, use layout from macOS, which better fits the Material Design guidelines and also used in the Android QPA plugin. Task-number: QTBUG-58060 Change-Id: I06381219b5f1ad0a32742487fd314a8017d82dfc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Cleanup unused qdoc markersJ-P Nurmi2017-04-185-12/+0
| | | | | | | | | | Change-Id: Ia42868a2e322aef2ae9a98049694f630b3458bcc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Universal/RadioDelegate: remove spurious control-propertyJ-P Nurmi2017-04-181-2/+0
| | | | | | | | | | | | | | Apparently slipped in by accident in b663020c. Change-Id: Ie0a292b6c230c4593c76165d2a78b946bb38351a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SystemTrayIcon: Fix documentation code snippetv5.9.0-beta2Friedemann Kleint2017-04-111-1/+1
| | | | | | | | | | | | | | MenuItem provides signal onTriggered(). Change-Id: Id61aee07d0463bc66a9e50d931a791fc4e0783c2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: update the type comparison tableJ-P Nurmi2017-04-111-3/+1
| | | | | | | | | | | | | | ComboBox::editable was added in Qt Quick Controls 2.2 in Qt 5.9. Change-Id: I5db1a6448a23d0e4f539f11c074270670b83899f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Cancel incubation recursivelyJ-P Nurmi2017-04-101-3/+15
| | | | | | | | | | | | | | | | | | | | | | It turns out that cancelling the incubation of eg. a combobox popup alone is not enough when its children might be incubating and would be left incorrectly guarded. Cancel recursively the whole object tree of a replaced/destroyed delegate to avoid that. Task-number: QTBUG-50992 Change-Id: Ia06931c4c7af3ed8bb56af6c29eb51081c4fccbb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | ScrollBar: react immediately when using a mouseJ-P Nurmi2017-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. [ChangeLog][Important Behavior Changes] ScrollBar now reacts immediately when using a mouse. Task-number: QTBUG-58667 Change-Id: I51759fc01dc8b8536834a8a3cca635ff512f7dc9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickScrollBar: handle touch eventsJ-P Nurmi2017-04-103-0/+55
| | | | | | | | | | Change-Id: I0521eb36ee01abc72edc869d92910e823f00a2f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTabBar: add missing Q_REVISION() for contentWidth/HeightChanged()J-P Nurmi2017-04-061-2/+2
| | | | | | | | | | | | | | Missed in 24acfcaf. Change-Id: I11c87a21d7d29befec5784eff1961a6feb5ea24b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: highlight the Wearable Demo on the index pageJ-P Nurmi2017-04-061-0/+1
| | | | | | | | | | Change-Id: Ib7eb50df859ea598aac806dbd44f150f2b77e4e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | RangeSlider: react immediately when using a mouseJ-P Nurmi2017-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. Task-number: QTBUG-59920 Change-Id: Ida36eed1f59a30173e3a2c53b55e044a87c98d8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dial: react immediately when using a mouseJ-P Nurmi2017-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. Task-number: QTBUG-59920 Change-Id: I097cbdaed4933c0d907097b75f15ba16dcf615b1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Slider: react immediately when using a mouseJ-P Nurmi2017-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial drag threshold is a necessary evil on touch to avoid conflicting with flickables, but leads to bad experience (QTBUG-47081) when using a mouse. Now that we have separate mouse and touch handling, we can apply immediate moves when using a mouse, but keep the old behavior on touch. Changing the behavior is simple, but auto tests need quite many tweaks so RangeSlider and Dial will be done separate follow up changes. [ChangeLog][Important Behavior Changes] Sliders and Dials now react immediately when using a mouse. Now the initial drag threshold applies only on touch, to avoid conflicting with flickables. Task-number: QTBUG-59920 Change-Id: Ifc1e6ed74c7894c3c854c975dff5238278827590 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Set explicit cursors on all interactive controlsJ-P Nurmi2017-04-0512-4/+82
| | | | | | | | | | | | | | | | | | | | | | | | For example, if you have a floating button on top of a text editor, hovering the button must change the cursor from the editor's ibeam cursor to an arrow cursor. This applies to all interactive controls that call setAcceptedMouseButtons(). If a control blocks mouse events, it should not use some random cursor from another control underneath. Task-number: QTBUG-59629 Change-Id: I8a6ae306bbc76a9b22377361cb19cf9c3a872d31 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | StackView: resolve relative URLs to the callerJ-P Nurmi2017-04-042-5/+15
| | | | | | | | | | | | Task-number: QTBUG-59309 Change-Id: I3c19d55431dd4831c4510acb5ef0e9fffa8f478f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickScrollBar: set implicit Cursor as Qt::ArrowCursorKarol Polak2017-04-041-0/+3
| | | | | | | | | | | | | | | | Scrollbar over TextArea had Qt::IBeamCursor, although the textarea would not be activated when clicked. Task-number: QTBUG-59629 Change-Id: Ie96ba03360fcfb5872f5bb6345e168c987978aca Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | BusyIndicator: add lacking initialization in material styleKarol Polak2017-04-041-1/+1
| | | | | | | | | | | | | | | | Random values of the m_elapsed could make the time in updateCurrentTime invalid. Task-number: QTBUG-59911 Change-Id: I8d36f50f01679f56300df9bae00a8d5de6528cc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | TextField: make textEdited() availableJ-P Nurmi2017-04-031-0/+1
| | | | | | | | | | | | | | The signal was added in Qt Quick 2.9 and has revision 9. Change-Id: Id1bb0f17ac5d8c9684ab5127782d030b54756e6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add missing Popup::aboutToShow() and aboutToHide() signalsJ-P Nurmi2017-04-031-2/+18
| | | | | | | | | | | | | | | | | | The signals have been there since the first release. The docs were just missing. Change-Id: I5f5340859136b8924832da4ddb2a18d4a812cca3 Task-numer: QTBUG-59400 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: replace "released" with "introduced" on the index pageJ-P Nurmi2017-04-031-1/+1
| | | | | | | | | | | | | | | | To use the same "was introduced in Qt 5.7" phrasing already used at the top of the page. Change-Id: I3736a1c3e87aa91e7fa3b8a41370f4b2252e793d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add style screenshots on the index pageJ-P Nurmi2017-04-031-0/+30
| | | | | | | | | | | | | | To make it more clear what the controls are and how they look. Change-Id: I6ce9a56a1692d90900952be798d7b254bc067dbb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: merge controls & styles columns in the version tableJ-P Nurmi2017-04-031-7/+3
| | | | | | | | | | | | | | | | | | | | The version table added in c9cd624 looked fine in locally generated docs, but it seems to get a bit too wide in the online snapshots (the table becomes horizontally scrollable). => Merge the controls and styles columns that all have the same version. Change-Id: Icb8387f95211ddee030cb410594adc9a6fad5c97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: mention that standardButtons is ordered according to platformMitch Curtis2017-04-032-0/+4
| | | | | | | | | | | | | | | | | | This was mentioned in the detailed description of DialogButtonBox, but could easily be missed by users looking at Dialog's standardButtons documentation, because that doesn't mention DialogButtonBox. Change-Id: If3229589e24992d3071388a044246906e739a918 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: Correct two link errorsv5.9.0-beta1Nico Vertriest2017-03-301-2/+2
| | | | | | | | | | | | | | | | qtquickcontrols2-customize.qdoc:28: Can't link to 'Creating Qt Quick Projects' qtquickcontrols2-customize.qdoc:28: warning: Can't link to 'Creating C++ Classes' Change-Id: I5ddc57215fd65fa6a80819ee694b5e031676f5a7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add missing \since to SwipeView::orientationJ-P Nurmi2017-03-291-0/+1
| | | | | | | | | | | | | | The property was added in 4a97498. Change-Id: I0f21f499e74450780db85d5c2c92aa4a0367c3b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: list available import versions in each Qt releaseJ-P Nurmi2017-03-291-0/+42
| | | | | | | | | | Change-Id: I5bce83d66615f11588988947d088d4b6ce5240b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ComboBox: cleanup superfluous QtQuick.Window importsJ-P Nurmi2017-03-283-3/+0
| | | | | | | | | | | | | | The Window attached property has not been used since 3bbd90c7. Change-Id: I09e0c620aa83533c98316f50d6bfe3fd292761d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Universal/SwipeDelegate: remove native text rendering leftoverJ-P Nurmi2017-03-281-1/+0
| | | | | | | | | | | | | | | | Native text rendering was removed in 3f5a66eb at the same time SwipeDelegate was being developed. Change-Id: I14eb1f335963abb9ead9450d62262990a3abc7d9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: fix linking error in qquickdial.cppJ-P Nurmi2017-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | Dial::valueAt() does not exist. qquickdial.cpp:515: warning: Can't link to 'valueAt()' The broken see also link was accidentally copied from Slider. Change-Id: I781b7d0bcf15d3b34dd2b8784a273d5cd7218469 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Pass a parent to QQmlContextsMitch Curtis2017-03-243-3/+3
| | | | | | | | | | | | | | | | To avoid crashes in the future. Task-number: QTBUG-59532 Change-Id: Ie81f95939fc5655567f9d987cf040daf3a32df43 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | StackView: provide better warnings and errorsJ-P Nurmi2017-03-245-22/+57
| | | | | | | | | | | | | | | | | | Check for valid URLs and test object types. Throw warnings when appropriate instead of crashing later. Task-number: QTBUG-59634 Change-Id: Ia269dc8afd31b618f1ff7aec94d684029cb78244 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickStackViewPrivate::warn() helperJ-P Nurmi2017-03-243-6/+23
| | | | | | | | | | | | | | | | | | Store the current operation name internally to allow throwing informative warnings when component creation fails. Task-number: QTBUG-59634 Change-Id: I7506c5eb4be35878c8abd73a637357e0d8ae08a2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | StackView: improve the component creation errorsJ-P Nurmi2017-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | Previously it just dumped the error from the component, without telling that it was anyhow related to StackView. Now it uses the standard QML warning syntax and includes the name of the operation (push/replace). Task-number: QTBUG-59634 Change-Id: Iea8df51f587c243ca065627e59bb0e5b5b526664 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickSwipePrivate: parent delegate context to controlMitch Curtis2017-03-241-1/+1
| | | | | | | | | | | | | | | | | | This fixes a crash in QQuickSwipeDelegatePriavte's destructor when using QML debugging. Task-number: QTBUG-59532 Change-Id: I55f97039eb723652fec24e4c3a8ce5d1a8fb6c41 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Popup.qml: fix typoJ-P Nurmi2017-03-233-3/+3
| | | | | | | | | | | | | | Task-number: QTBUG-59661 Change-Id: I35627bafc57266cb7b2842fe02765536ca7eecba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Doc: fix Control::localeJ-P Nurmi2017-03-221-4/+4
| | | | | | | | | | | | | | | | | | The documentation body was clearly copied from Control::font. Locale doesn't have mutable properties. Instead, one has to create a locale using Qt.locale(). Change the wording to match that. Change-Id: I637b00808c29c16ee768820be327e3c780cfee64 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add missing docs for ApplicationWindow::localeJ-P Nurmi2017-03-221-0/+14
| | | | | | | | | | Change-Id: I799eb73a05842b1990b5615fd01ad5204c554f20 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickComboBox: don't emit highlightedIndexChanged() during destructionJ-P Nurmi2017-03-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If QQuickComboBox was destroyed while its popup was open, it emitted highlightedIndexChanged() during the destruction due to the popup's visibility change. Use setPopup(nullptr) to destroy the popup in a controlled manner, that is, disconnecting the relevant signals first. This way deleting the popup doesn't have weird side-effects during the destruction of QQuickComboBox. Task-number: QTBUG-57650 Change-Id: I1c55707be68a24e115276ffb6dfa1c89051a45ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix AbstractButton 2.2 registrationJ-P Nurmi2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlRegisterRevision() registers a nameless type, so using it would make AbstractButton throw confusingly formatted warnings: QML : <warning> instead of QML AbstractButton: <warning> Change-Id: I6b51824ad019ed9451079cf8a2595e908ef8187e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | fix capitalization of item library nameTim Jenssen2017-03-141-1/+1
| | | | | | | | | | Change-Id: Ie371dced41ed86373aeb0a4600cb0245b4550b7e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | add FontSection to all controlsTim Jenssen2017-03-1422-0/+88
| | | | | | | | | | Change-Id: I0352376201a1efd318f89a758dd8dc5a269742f4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | add default designer content to tumblerTim Jenssen2017-03-141-0/+2
| | | | | | | | | | Change-Id: Idcd36f81abf0968c7e85a04c0faf340e4309ef18 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Doc: restore the slider tooltip snippetJ-P Nurmi2017-03-141-0/+53
| | | | | | | | | | | | | | | | The snippet was removed in b026ebf67 when Slider::live was added, but it was not noticed that the snippet was also used in Tooltip docs. Change-Id: I8dac3bb90bc44ca447f9e34d0015443e6245d894 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* | Add ScrollView to designer item libraryThomas Hartmann2017-03-103-0/+16
| | | | | | | | | | | | Change-Id: If141c5dd6a0126c49f508590a5addb7f8e4b2159 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>