aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Build fix for -no-feature-validatorPaul Olav Tvete2017-03-101-0/+4
| | | | | Change-Id: I869b25ff2c9efe1c21def0baf4de0606c7c9baa2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-systemtrayiconPaul Olav Tvete2017-03-106-11/+34
| | | | | Change-Id: If991e2311f37c1977cdf2a913b3f022e5f999f5f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-106-6/+20
|\ | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextfield.cpp Change-Id: Ie80a2d3bcbb961a38e3dffa247547d3d860c231a
| * Add missing QML type registrationsJ-P Nurmi2017-02-202-0/+2
| | | | | | | | | | | | | | | | For the internal Radio and CheckIndicator types. Task-number: QTBUG-59026 Change-Id: I7e34f29e33ebd3d748892df0ba1592fe8ae5ed44 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Editors: fix mouse cursorJ-P Nurmi2017-02-082-4/+8
| | | | | | | | | | | | | | | | Read-only editors should not use the IBeam cursor, but switch to a plain arrow cursor. Change-Id: If579571ceff086af6b8259ade769b5efb27565db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix a crash with focus handling when destructing QQAppWindowJan Arve Saether2017-02-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because QQuickApplicationWindow connected SIGNAL(activeFocusItemChanged()) to SLOT(_q_updateActiveFocus())); it would enter _q_updateActiveFocus() from the dtor of QQuickWindow (because dtor of QQuickWindow would emit activeFocusItemChanged()). At that point the QQuickApplicationWindow object for the member function _q_updateActiveFocus() was already destroyed, so we would crash. Instead, make sure we clear the focus as early as possible, and then disconnect in case activeFocusItemChanged() is emitted after QQuickApplicationWindow is destroyed. Task-number: QTBUG-57846 Change-Id: I4b1999e647b970394436a2d462b7f352f1c8a811 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * QQuickPopup: allow window change after component completionJ-P Nurmi2017-01-251-2/+7
| | | | | | | | | | | | | | | | | | | | | | When visible has been set true, don't attempt to start the enter transition from componentComplete(), but wait until the popup is associated with a window. This makes it possible to share a single QQuickView instance for all data rows in tst_snippets. Task-number: QTBUG-58196 Change-Id: I9204e0d2e6468a21ee36f313daedc43d2e919ec6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-082-0/+4
| | | | | | | | | | Change-Id: I89c037629037a73fd481d29b28bd15b1ba57af09 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Build fix for -no-feature-imPaul Olav Tvete2017-03-082-0/+6
| | | | | | | | | | Change-Id: I5cd37b78c18847c9535584d0452c8214873db5f2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Build fix for -no-feature-menuPaul Olav Tvete2017-03-081-0/+2
| | | | | | | | | | Change-Id: I5e8afbf0aa1704a13d359e7ddf867cd791b3f0db Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Build fix for -no-feature-texteditPaul Olav Tvete2017-03-081-0/+2
| | | | | | | | | | Change-Id: I606e0e68c16faceaddbddacb37eec7d557e184ce Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Platform Menus: support sub menus in the Qt Widgets fallback menusJ-P Nurmi2017-03-084-13/+26
| | | | | | | | | | | | | | | | | | Implement all the missing things and fix the type of the cast in QWidgetPlatformMenuItem::setMenu() to make sub menus work with the widgets fallbacks. Change-Id: I19bb010a5c639a77b76d1d92a47ad03576c06d2f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: visually indicate RangeSlider’s rangeMitch Curtis2017-03-062-0/+9
| | | | | | | | | | | | | | | | This makes the range that the user has selected clear, and is already done by other styles. Change-Id: Ib8f2c81e823193fa9934587d04fc011aafc0bd65 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Improve qtquickcontrols2-buttons.qdocMitch Curtis2017-03-061-8/+5
| | | | | | | | | | Change-Id: Ie417f6377016e1a28122efefcc9fcef5e642d027 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Improve qtquickcontrols2-popups.qdocMitch Curtis2017-03-061-1/+1
| | | | | | | | | | Change-Id: Iaf3159b993ada20a30a8208f7cfe92731966a3f7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix Button GIFMitch Curtis2017-03-021-0/+0
| | | | | | | | | | | | | | | | The background didn't show up unless setHighQuality(true) was used. Task-number: QTBUG-59233 Change-Id: Ief04c48b7c82d5c6be2e63de5c515cdf763a2064 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Make QQuickStyleSelector::select() more robustJ-P Nurmi2017-03-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While debugging QTBUG-59026, I found out that QLocale::name() is empty with the "C" locale. Because the empty locale name was used as a selector in QQuickStyleSelector, it ended up registering QML types using URLs that contained a double slash (empty locale selector matched): QtQuick/Controls.2/Material//RadioButton.qml At the same time, the QML engine imported implicitly internal QML types constructing the URLs directly based on the location on the file system without a double slash: QtQuick/Controls.2/Material/RadioIndicator.qml As a result, the same QML module ended up having types registered from two different URLs, which is not allowed. This change simply prevents both problems. First of all, if the locale name is empty for any reason, it won't be added anymore to the list of selectors. Furthermore, the final selected URL is normalized to avoid redundant dashes. Task-number: QTBUG-59026 Change-Id: I19b890451aaddfe4277bb6b26bc3c1394a75a704 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix QQuickStackViewPrivate::startTransition()J-P Nurmi2017-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This seems like a mistake that slipped in when popTransition(), pushTransition() and replaceTransition() were merged in acecb06. Only immediate push/pop/replace operations were affected, where the animations were force-completed by hand. In this scenario it was always passing the pop transitions for completion, even if the current operation was push or replace. Change-Id: I6a940953feaefe6643ddae26c070856a66bf6c10 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add missing includesJ-P Nurmi2017-02-243-0/+3
| | | | | | | | | | | | | | Found while doing a -no-accessibility build. Change-Id: I9772316eed3d544b21926970371a590ef2c15bef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Port from QT_NO_ACCESSIBILITY to QT_CONFIG(accessibility)J-P Nurmi2017-02-2481-124/+124
| | | | | | | | | | Change-Id: I03deebff661746d49e537af5b1c8899b938efb0d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Port from QT_NO_CURSOR to QT_CONFIG(cursor)J-P Nurmi2017-02-244-4/+4
| | | | | | | | | | Change-Id: If7dd96ed25b1183586b903503b160fdeaef1ccea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-24154-723/+671
| | | | | | | | | | | | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ApplicationWindow: fix typoJ-P Nurmi2017-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was meant to be called contentData, as the getter is called, but the part in the Q_PROPERTY macro that specifies the name of the property contained "data" in place of "contentData". [ChangeLog][Controls][ApplicationWindow] The data-property has been renamed to contentData, as it was documented. Notice that a data-property still exists in QML Window, but is no longer overshadowed in ApplicationWindow. Task-number: QTBUG-58932 Change-Id: I5251d42f5ae5ef6d04d87c3f8d20d7adbefe1eb5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: remove color animation on various controls' backgroundMitch Curtis2017-02-244-25/+0
| | | | | | | | | | | | | | | | | | This resulted in the background becoming very dark when toggling between enabled/disabled or editable/read-only states. Task-number: QTBUG-58828 Change-Id: I710fa97aefd26e490a219ba99833d5bfe47f2133 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | QQuickStackView: fix pop/replace exit leakJ-P Nurmi2017-02-243-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickStackView did not keep track of the element that was exiting the view during a pop/replace exit transition, but it was expecting viewItemTransitionFinished() to be called and cleaned up the element there. If a pop/replace exit transition was running at the destruction time, QQuickStackView did not clean up the element at all (because it had been already removed from the internal stack of elements) and thus the transition was left running. Task-number: QTBUG-59034 Change-Id: I3cd7c761fab79574b9a7cc849788f36765def45b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Prevent StackView filtering of UngrabMouse eventMichael Dippold2017-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | Currently the StackView is filtering the UngrabMouse event during transitions. If a MouseArea is still in the pressed state during this time it will forever be in the pressed state as the ungrab event is filtered. Task-number: QTBUG-59098 Change-Id: I7effdad6a36b64336b4770a1dca61ba47998b787 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | QQuickPopup: ensure that the cursor is correct when overlapping itemsMitch Curtis2017-02-201-0/+3
| | | | | | | | | | | | | | | | | | | | When a popup is over an item that has a different cursor (such as a TextField), the cursor incorrectly took on that shape, because QQuickPopup didn’t have an explicitly set cursor. Task-number: QTBUG-58810 Change-Id: I4df6dd725cac027b2c30fe69ad81d9cd7e622c15 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Platform: respect the configurable features in Qt Widgetsv5.9.0-alpha1J-P Nurmi2017-02-102-19/+88
| | | | | | | | | | | | Change-Id: I4a0696e4f897a378e3944c7948ba00e5f2038f5d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Cancel incubation of replaced/destroyed delegatesJ-P Nurmi2017-02-1016-96/+23
| | | | | | | | | | | | | | | | Resolves the "Object destroyed during incubation" issues. Task-number: QTBUG-50992 Change-Id: Ie58c958dafbf915da7494dac25351be98106c6ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Provide more context for the configurable feature descriptionsJ-P Nurmi2017-02-082-3/+3
| | | | | | | | | | Change-Id: I962d8150583cc1637cbb8d6fb7399b8f408b186e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Fix -no-feature-shortcut buildJ-P Nurmi2017-02-074-4/+12
| | | | | | | | | | Change-Id: If567b99889b40528150834c3319cdfec8e5b229e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Respect the "Quick Designer support" featureJ-P Nurmi2017-02-071-1/+1
| | | | | | | | | | Change-Id: Ibebff13b92d2ad9335de872f0b70ae3f43051061 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make styles configurable featuresJ-P Nurmi2017-02-065-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./configure [...] Qt Quick Controls 2: Styles ................................. Default Material Universal Supports both syntaxes: -(no-)style-[material|universal] -(no-)feature-quickcontrols2-[material|universal] Change-Id: I011cc38e5752d2c718376ca7493940271920b3e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add "hover support" configure featureJ-P Nurmi2017-02-0615-6/+151
| | | | | | | | | | | | | | | | | | | | ./configure -no-feature-quicktemplates2-hover [...] Qt Quick Templates 2: Hover support .......................... no Change-Id: I0509a1a9ac3ffe2cbfe4f2016ce0345708860b84 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: move Control::contentItem snippet to match backgroundMitch Curtis2017-02-031-9/+9
| | | | | | | | | | Change-Id: I46ff0f20bbdde131d4206a970ce60c76d491f24b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add missing information to "Attached properties" sectionMitch Curtis2017-02-021-15/+61
| | | | | | | | | | | | | | | | | | A lot of details were left out, which makes it hard to follow along. Task-number: QTBUG-56013 Change-Id: Ia21dd43e0d6e260463a2a91b28c248b962dd3401 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Tumbler requires ListView and PathViewJ-P Nurmi2017-02-024-7/+31
| | | | | | | | | | Change-Id: Ieb40f536cc5d68fdf13075df2c9b3e09d5077de3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge dev into 5.9Oswald Buddenhagen2017-02-0128-34/+1146
|\ \ | | | | | | | | | Change-Id: I816cc71d81ee6435ff9a58aff2d538698f9f8072
| * | Make TextArea work out of the box inside ScrollViewJ-P Nurmi2017-01-273-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][TextArea] TextArea has been made to work inside ScrollView, providing necessary scroll bars out of the box. Change-Id: I212ee4c60912c961cbb9683540848141dcba29a5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Add ScrollViewJ-P Nurmi2017-01-2721-10/+1090
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollView] Added ScrollView. Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | QQuickScrollBarAttached: fix change listener removalJ-P Nurmi2017-01-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before bb2a6c6 QQuickScrollBarAttached called flickable->updateOrAddGeometryChangeListener(Size) when attaching to a Flickable, and flickable->removeItemChangeListener(Geometry) when detaching from a Flickable. In bb2a6c6 the latter was changed to flickable->updateOrRemoveGeometryChangeListener(listener, Size) to make the attach and detach operations nice and symmetric. Now the problem is that updateOrRemoveGeometryChangeListener(Size) doesn't actually remove the listener, but just resets the geometry types it listens to. Thus, upon destruction of QQuickScrollBarAttached, it leaves behind a dangling pointer in Flickable's list of change listeners. We can call either of these to fix the problem: flickable->updateOrRemoveGeometryChangeListener(Nothing) flickable->removeItemChangeListener(Geometry) The former does essentially the latter with some extra overhead, so we'll just revert back to how it was before bb2a6c6. I added a warning note, also to ScrollIndicator since it's using the same approach, to avoid the same pitfall in the future. Change-Id: Ibdce15b22edf549491426d769b74b18daf0500ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Keep track whether ScrollBar::interactive is explicitly setJ-P Nurmi2017-01-263-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upcoming ScrollView toggles between interactive and non-interactive scroll bars depending on whether it is interacted via touch or a mouse device. This allows ScrollView to check whether the user or style explicitly requested a specific mode and respect it. Change-Id: I69d21652b3a91cb9db0f76ba52adc35ccd612ab1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-251-2/+6
| |\| | | | | | | | | | Change-Id: I83cbec9264a8bc620badf210eee53b57f2b93ff0
| | * QQuickPopup: allow QQuickWindow as a parentJ-P Nurmi2017-01-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Previously it would unintuitively complain that "cannot find any window to open popup in" if a window was passed as a parent. Change-Id: I984d4c941afae12733a9c1c2f0441da867298aa1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 21:51:17 +0000