aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use resource path for test data on Android and iOSMitch Curtis2019-04-242-3/+10
| | | | | | | | | | | | | | | | | qtbase/mkspecs/features/testcase.prf already generates a .qrc file containing the files in TESTDATA, so instead of trying to copy QML files to the device, we can just use the existing resources. This fixes the following failure, which affects all tests using util.pri: FAIL! : tst_cursor::initTestCase() 'QDir::setCurrent(m_directory)' returned FALSE. (Could not chdir to :/) Change-Id: I1fd7449437be045a7230a7679e24252cdf9c0ccc Fixes: QTBUG-73604 Fixes: QTBUG-73606 Fixes: QTBUG-73607 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* ScrollBar: fix value not changing when scrolling via VoiceOverMitch Curtis2019-04-241-1/+15
| | | | | | | | | Connect to the QQuickAccessibleAttached::increaseAction() and QQuickAccessibleAttached::decreaseAction() signals. Change-Id: I9d6b37ac68d8790edcb3d4d72f155ec8511cabe2 Fixes: QTBUG-75072 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+46
|\ | | | | | | Change-Id: Ib631757c6c4d4bfeef0fe34d625139f29fa3f2d0
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-031-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 16836da1ae44c11317b9861764ea55cce39eac02 Page: fix binding loop + feed3b7b8077f2c9bba72c49e249fb96c262d72e Drawer: fix infinite positioning loop + fa641ab12340fa128668318a1fe7c6a01906f163 Add dialogs manual test + 951bfc041f1f43272f73d9cbc47100060c379c0c Doc: restructure and fill in Imagine customization section + d45d163240fca2fcdec445f1d8622062ad90bdd8 Doc: state that negative scales for Popup are not supported + 637630cc7ed0e6efd43678b11d1309e72a957874 Remove the internal_module config to enable generation of cmake files + 05eb8127594f0d40247e8c84a4704277dd12d16e QQuickMenu: allow enter/return to be used to activate items + 694438066eb88e53e4070630e6b99d0f552d254d qtlite: Fix build the source code with -no-feature-shortcut + 9fdbdea176007ed7b470e317e9002aa77ddd4ead Fix tst_cursor::controls(containers) test failing after change in the Windows QPA + ff30fc5f5f637da6a06a33ae0e55d5e4b798099d QQuickScrollView: respect the content size set on/by the flickable + 73914e00dba2fe259108197d01b6744ce16b63d8 Add *.pro.user.* to .gitignore + 1ef176b5da8ad8d4993fa9296e64e44ee8de6560 Fix attached ToolTips using the timeout of the last shown tool tip + 8b78d9cea3091b0bd94d1ae0c71a000f8e7e1903 Fix DialogButtonBox content size calculation + 0ee25027edf1be38412e2a397c1c0a71d2bd146b Handle recursion depth errors in tst_sanity.cpp + 27e030f24b05dac56189c34951da38fd68dc64a1 Bump version + 5a07a970fa9d73fc2c4da8966fadcb35d142c7f5 QQuickComboBox: ensure we don't close popup on iOS + 5135bec50762955b3a1138ecda10214a9d0bf62a DialogButtonBox: don't sort buttons based on their memory addresses + 11995169ee09a99ef1af4c778e30e25829c635b4 Mark BaseValidator::throwRecursionDepthError() as final + 10023b188bb84d631fea53baa9ce5997f3fc286d Default: fix highlighted ItemDelegate colors + d0f6b28618f7252f3f7c915a6a91a153f350e354 Fix typo in ScrollBar's documentation + 7c31b884b932034bb907db638f155b813d90aff2 Attempt to stabilize Tumbler::test_itemsCorrectlyPositioned + ef9ab1a4bd4e3545cfb1c23c002e58b3e078ed75 tst_dialogbuttonbox.qml: use tryVerify() consistently to avoid flakiness + 1bb25edd6c30e163976afa43065671ffcb56d6f4 tst_dialogbuttonbox.qml: consolidate two similar tests Change-Id: I32bc2dc040808d8b556e5231e1d2b77a50138b4e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickComboBox: don't hide popup if focusedAlberto Mardegan2019-04-102-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | The ComboBox popup should be closed when the ComboBox loses focus, but not if the control gaining focus is the popup itself. While all the styles implemented in this module implement the ComboBox popup as an unfocusable window and handle all the keyboard events in QQuickComboBox itself, the developer can choose to replace the popup with a custom implementation, which might need the keyboard focus. Fixes: QTBUG-74661 Change-Id: I838ab9cb697df63ea2099e68f1ae99eadb06be08 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Doc: expand upon Pane's Content Sizing sectionMitch Curtis2019-04-081-0/+16
| | | | | | | | | | | | | | | | | | Mention what happens if its contentItem has no implicit size and only one child item. Change-Id: I646ca2baad89ac195836268b14108b43beaec2bf Fixes: QTBUG-69096 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: add a Size section to explain StackView's sizing behaviorMitch Curtis2019-04-081-0/+29
| | | | | | | | | | | | Task-number: QTBUG-74902 Change-Id: I3f77459028de48729bb78353d8d95e92c7fc98f6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | SpinBox: fix indicators being hovered when mouse is moved while pressedMitch Curtis2019-04-082-2/+37
| | | | | | | | | | | | | | | | | | | | | | We also need to update the hovered state of each indicator when the mouse is moved while pressed, not just when we get hover move events. Change-Id: I6fa71344fd540f648683958e5804ae735523e72d Fixes: QTBUG-74688 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Doc: Add the moduleheader informationVenugopal Shivashankar2019-04-031-0/+1
|/ | | | | | | | | | | | | Although the doc project is named QtQuickControls, the repo is still called qtquickcontrols2 and the exported headers are installed under QT_INSTALL_PREFIX/include/QtQuickControls2. By default, Qdoc tries to look for the headers in a directory that matches the doc project name, which is not the right include directory in this case. Change-Id: I77889fe35c028a2fc903d49b571a564c57326c21 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_dialogbuttonbox.qml: consolidate two similar testsMitch Curtis2019-03-291-24/+11
| | | | | | | into one data-driven one. Change-Id: I7507765747dd984530e50df5cd08152b9d71cb66 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* tst_dialogbuttonbox.qml: use tryVerify() consistently to avoid flakinessMitch Curtis2019-03-291-8/+12
| | | | | | Change-Id: Ic18cca692b09f55818b9c99379aae4be72ba4159 Fixes: QTBUG-74711 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Attempt to stabilize Tumbler::test_itemsCorrectlyPositionedMitch Curtis2019-03-291-1/+1
| | | | | | | | | | | I'm not sure if this will help (because I haven't been able to reproduce the flakiness, even in a CI VM), but the tumbler should really not still be spinning after we got the position of its items, so make sure it's stopped before doing any comparisons. Task-number: QTBUG-70597 Change-Id: I72555747b2ea4ef136cdaa13f7b0757be2624e73 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix typo in ScrollBar's documentationMitch Curtis2019-03-281-1/+1
| | | | | Change-Id: I3a26f24ad16f6330715ce62151895f28e4b856d3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Default: fix highlighted ItemDelegate colorsMitch Curtis2019-03-273-3/+4
| | | | | | | | | | | | | | | | - Make ItemDelegate respect highlightedText - Change ItemDelegate's highlightedText palette role from white to almost black (i.e inversion of "light" which is 0xFF090909), so that text shows up against a highlighted background. This also allows easily switching ComboBox to a dark style via palette customization. Fixes: QTBUG-72786 Fixes: QTBUG-74678 Change-Id: I5ad0d86de112f869edf0488d06bb308cdc900363 Reviewed-by: Massimo Callegari <massimocallegari@yahoo.it> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Mark BaseValidator::throwRecursionDepthError() as finalUlf Hermann2019-03-271-1/+1
| | | | | | Task-number: QTBUG-74512 Change-Id: I7b154d793c134a93aa3a48ade7d3ae785c44e7ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* DialogButtonBox: don't sort buttons based on their memory addressesMitch Curtis2019-03-222-2/+32
| | | | | | | | | | | | | | | | | | | | | | | When two buttons' roles are equal, the code would fall back to comparing the buttons' memory addresses. This leads to random results, which are especially noticeable on Windows and with release builds. This patch fixes the issue by instead returning false if the roles are equal. This still satisfies the "comp(a,a)==false" requirement of strict weak ordering: https://en.cppreference.com/w/cpp/named_req/Compare The patch also changes the sorting algorithm used from std::sort() to std::stable_sort(). Although it doesn't appear to be necessary from the testing that I did, it is good to ensure that the order of equal elements is maintained. Fixes: QTBUG-70451 Change-Id: I47561604108b12bf8ec0c794a2372767f0b2e04e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QQuickComboBox: ensure we don't close popup on iOSRichard Moe Gustavsen2019-03-211-4/+15
| | | | | | | | | | | | | | | | | | | | On iOS (and Android), we give focus to a control on touch release (rather than on touch begin, which is normal on desktop). For a QQuickCombobox, this means that we will both handle focus and open the popup on touch release, and not focus on touch begin and open popup on touch release, like on desktop. Because of this, we need to be more careful about when we choose to close the popup as well, otherwise it will close down before it gets a chance to show on iOS. This patch will check why we lose focus on both the inner line edit and the combobox itself, and based on this, choose whether we should close the popup. Basically, if focus is just transferred between the popup button and the line edit, we choose to keep the popup open. Fixes: QTBUG-70161 Change-Id: Iec242c0b5570844868085480fdf96fc49d189b82 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: Icbbe5fba6bfa6b4bb14a174d2ffafb85f223e0bf
* Handle recursion depth errors in tst_sanity.cppUlf Hermann2019-03-181-0/+6
| | | | | | | | Implementations of QQmlJS::AST::Visitor are required to do so. Fixes: QTBUG-74512 Change-Id: I19d40d2d3a5d3588cad4caa7f0a48c13919077a0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix DialogButtonBox content size calculationMitch Curtis2019-03-155-11/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some history: - f1f884d3 worked around an issue in DialogButtonBox. - c2fd8f7d fixed it by using contentWidth; i.e. the implicit width of the contentItem. It caused QTBUG-72372. - I tried to fix QTBUG-72372 with 6476de0b, but created (or exposed) QTBUG-73860. The problem in QTBUG-73860 can be seen with the following example: Dialog { id: dialog visible: true standardButtons: Dialog.Ok } The single 'Ok' button here will go outside of the dialog. The underlying issue can be seen by looking into DialogButtonBox.qml: implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, (control.count === 1 ? contentWidth * 2 : contentWidth) + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) The implicit width of the box in this case is contentWidth * 2 (there is one button, so control.count === 1). This should result in the button taking half the width of the box and being aligned to the right: alignment: count === 1 ? Qt.AlignRight : undefined ... delegate: Button { width: control.count === 1 ? control.availableWidth / 2 : undefined } What actually happens is that the contentItem (ListView) is temporarily 0 until it gets its final size of 100. However, QQuickDialogButtonBox doesn't respond to this change in the ListView's contentWidth. This problem can be fixed by returning to c2fd8f7d's resizeContent() implementation, which uses contentWidth. Then, there is a second issue: Dialog { id: dialog visible: true standardButtons: Dialog.Ok width: 300 } The button here is also positioned outside of the box. The problem is that the contentWidth is based on implicitContentWidth: QQuickContainerPrivate::updateContentWidth() { // ... contentWidth = implicitContentWidth; // ... } implicitContentWidth is calculated by calling getContentWidth(): void QQuickControlPrivate::updateImplicitContentWidth() { // ... implicitContentWidth = getContentWidth(); // ... } In the case of horizontal alignment, QQuickDialogButtonBoxPrivate::getContentWidth() uses the implicit width of the largest button: for (int i = 0; i < count; ++i) { QQuickItem *item = q->itemAt(i); if (item) { totalWidth += item->implicitWidth(); maxWidth = qMax(maxWidth, item->implicitWidth()); } } // ... if ((alignment & Qt::AlignHorizontal_Mask) == 0) totalWidth = qMax(totalWidth, count * maxWidth + totalSpacing); The Default style button has an implicitWidth of 100. The DialogButtonBox in the example above is 300 pixels wide, so the button should be 150, and it is, thanks to its width binding. However, the DialogButtonBox uses contentWidth to size its contentItem (ListView), and the contentWidth is, as mentioned, 100: the implicit width of the button. So, the button ends up hanging over the side of the box, as it's larger than the box thinks it is. This problem is fixed by setting DialogButtonBox's contentWidth to the contentWidth of the contentItem (ListView). This makes DialogButtonBox use the explicit widths of the buttons rather than their implicit widths. Since the contentWidth is no longer implicit, we must also change any use of contentWidth in the implicitWidth binding to implicitContentWidth. While writing auto tests for this, they caught an issue where contentWidth wasn't updated, so now we call resizeContent() in QQuickContainer::setContentWidth(). Change-Id: I99ffda21b47aeb14d4382e453e87c4312f343a1c Fixes: QTBUG-72886 Fixes: QTBUG-73860 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+60
|\ | | | | | | Change-Id: I9f41b1731d8307c3b8725dfffee97191d03a14a6
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-251-0/+60
| | | | | | | | | | Change-Id: I024460c3dabc1240ed37f8bfd216b3bad81eebb5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix attached ToolTips using the timeout of the last shown tool tipMitch Curtis2019-03-082-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attached ToolTips share a single ToolTip item and set properties (such as delay) on it before showing it. Before 63899f3185, this wasn't a problem, but now QQuickToolTip has its own show() function that QQuickToolTipAttached calls. QQuickToolTipAttached passes -1 by default, which QQuickToolTip sees as the "default" and hence doesn't set a timeout at all. However, since that QQuickToolTip instance is shared, it still has a previous timeout value from the last time it was shown by a different QQuickToolTipAttached object. So, instead of QQuickToolTipAttached passing the timeout to QQuickToolTip::show(), make it set it on the QQuickToolTip instead. This ensures that it has the correct value if no timeout was specified for an attached tool tip. Task-number: QTBUG-74226 Change-Id: Iceed17bbb640a929fae3b9c975519df36cc2d210 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Add *.pro.user.* to .gitignoreMitch Curtis2019-03-061-0/+1
| | | | | | | | | | | | | | To ignore files like foo.pro.user.4.8-pre1 Change-Id: I465b36eda8a3a57854c25802d003d86ca7356f86 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | QQuickScrollView: respect the content size set on/by the flickableRichard Moe Gustavsen2019-03-052-27/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the flickable inside a scrollview has an explicit content size assigned, or if the flickable was created by the application, then don't fall back to calculate the content size. The reason is that it should not try to change the content size of a flickable that is controlled by the application (or by the flickable itself, in the case of ListView, ScrollView and TextArea). Sometimes e.g ListView will report a negative contentWidth, which is not considered illegal. From before we used to just check if the child flickable had a negative content size, and if so, take that as a evidence that the flickable was owned by the scrollview. But with this patch, we instead add two extra variables that keeps explicit track of whether or not we should read the content size from the flickable, regardless of the values it might return. With the two new variables, we also no longer need the "ownsFlickable" property, as we can instead use the new variables to check for the same. Fixes: QTBUG-72536 Fixes: QTBUG-74000 Fixes: QTBUG-72940 Change-Id: Iec87cc953557bf8c1bdb32a3c11b721c607fc19a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix tst_cursor::controls(containers) test failing after change in the ↵Friedemann Kleint2019-03-011-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Windows QPA The test failed in case the mouse cursor was within the view to be created. Move the cursor away to prevent that. Fixes: QTBUG-74130 Change-Id: I8d77fc9b4cc5380ddb06ba128bca7c1666357b50 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | qtlite: Fix build the source code with -no-feature-shortcutMikhail Svetkin2019-02-284-7/+43
| | | | | | | | | | Change-Id: I7247659b3c9f4634ff57bce1e55187def604e161 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: allow enter/return to be used to activate itemsMitch Curtis2019-02-285-3/+46
| | | | | | | | | | | | | | | | | | | | | | Before this patch, only space was allowed. Windows 10 and macOS 10.14.2 both allow using enter to activate menu items. Change-Id: I64476347669ff73f233efd129563a18ba51618a5 Fixes: QTBUG-73354 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Remove the internal_module config to enable generation of cmake filesAndy Shaw2019-02-271-1/+0
| | | | | | | | | | | | | | | | | | | | After checking, it seems that this is not needed and was likely added by accident, so removing internal_module will enable the cmake file generation so QtQuickTemplates2 can be used in a project. Change-Id: I4a3287147c3c8afb715ba8e4d21b8af6fc1e48f6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Doc: state that negative scales for Popup are not supportedMitch Curtis2019-02-251-2/+2
| | | | | | | | | | | | | | | | This sentence was probably copied from Item's docs. Task-number: QTBUG-73687 Change-Id: If9f7554c78cbc47abc7c9fdabacc8025864b76e0 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: restructure and fill in Imagine customization sectionMitch Curtis2019-02-251-6/+23
| | | | | | | | | | Change-Id: I1b34fe2df28c734395dc2a55340f2a7cb1629692 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Add dialogs manual testMitch Curtis2019-02-227-0/+529
| | | | | | | | | | | | | | | | | | | | As with the buttons manual test, there are a lot of possible combinations of dialogs, which makes automated testing very difficult. This test will allow us to see lots of different combinations all at once for a particular style. Change-Id: I42fa5a1e027c9f56bebf859078d3e54fe1902228 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Drawer: fix infinite positioning loopMitch Curtis2019-02-224-1/+97
| | | | | | | | | | | | | | | | | | This fixes the issue where Drawer would try to reposition itself forever, but does not address the fact that it is incorrectly positioned afterwards. Task-number: QTBUG-71290 Change-Id: Ibbd4baa84b66ab446ce3af2ef326f8c50e74216d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Page: fix binding loopMitch Curtis2019-02-202-0/+13
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Dialog (which derives from Page) has only its title set, there'd be a binding loop. A simplified version of the call stack: - QQuickPopup::componentComplete - QQuickPopupPrivate::prepareEnterTransition - QQuickItem::setVisible - QQuickPagePrivate::itemVisibilityChanged - QQuickDialog::implicitHeaderWidthChanged - QQmlBinding::expressionChanged <== Dialog.qml's implicitWidth binding - QQmlPropertyData::readProperty - QQuickDialog::implicitHeaderWidth - QQuickPage::implicitHeaderWidth - QQuickItem::implicitWidth <== QQuickPagePrivate::header, aka Label - QQuickTextPrivate::getImplicitWidth - QQuickTextPrivate::updateSize - QQuickTextPrivate::setupTextLayout - QQuickItem::setImplicitSize - QQuickItemPrivate::implicitWidthChanged - QQuickPagePrivate::itemImplicitWidthChanged - QQuickDialog::implicitHeaderWidthChanged - QQmlBinding::expressionChanged - QQmlAbstractBinding::printBindingLoopError Fix the issue by not emitting change signals if we're already in the process of doing so. Change-Id: I37d6fa35b1e70420e436c0e001f55035d7630542 Fixes: QTBUG-66494 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Doc: Fix incorrect link to Number.toLocaleString()Topi Reinio2019-02-191-1/+2
| | | | | | | Task-number: QTBUG-73849 Change-Id: I02b32f55fabc6274a071536234dd485bf4e9bd02 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* QQuickScrollView: only forward content size to flickable if set explicitRichard Moe Gustavsen2019-02-181-3/+14
| | | | | | | | | | | | | | TableView monitors if the application sets an explicit contentWidth/Height, and skips calculating it when that is the case. So be more careful from ScrollView, and don't set it on the flickable if the application did not set it explicitly. By doing it this way, you can now set an explicit contentWidth/Height both in ScrollView and TableView, and it will be respected. Task-number: QTBUG-72536 Change-Id: Ib87fa6958881fccdc47f50133e996484392281b6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickTheme: make sure QQuickTheme instance gets destroyed before qAppKonstantin Ritt2019-02-141-0/+12
| | | | | | | | QFont data must not be held at the application destruction time to make the font database correctly dispose all acquired resources. Change-Id: Ifc4a28a89701cf5622e8289a688eb0d4344c81fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fusion: fix buttons colorsMitch Curtis2019-02-111-1/+4
| | | | | | | | | Make Active and Disabled colors closer to Widgets' Fusion style. Task-number: QTBUG-70819 Change-Id: I61cf22eb4449b5443fa71349da8df2ff57ee9158 Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Popup: ensure that "palette" is reevaluated when enabled state changesMitch Curtis2019-02-057-1/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | When changing the enabled state of a Menu after component completion, the background would not change. The problem was that QQuickPopup::paletteChanged() was not being emitted when the enabled state changed, resulting in QQuickControl::palette() (which QQuickPopup::palette() forwards calls to via its popupItem) not being called. QQuickControl::palette() changes the palette's current color group to QPalette::Disabled when it is disabled, so if it's not called, the popup's colors won't change. Fix the issue by adding a virtual enabledChange() function to QQuickControl, which QQuickPopupItem can override to emit both QQuickPopup::enabledChanged() (saving a connection in the process) and QQuickPopup::paletteChanged(). This ensures that bindings to QQuickPopup::palette are re-evaluated. The patch adds a virtual instead of just emitting paletteChanged() in QQuickPopup::setEnabled(), because we also want to be notified of indirect enabled state changes, such as those coming from parent items. Change-Id: Ibdbd05f27b5a74fe731bda9d6698cbf6b8f81785 Fixes: QTBUG-73447 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: elaborate on event behavior with Popup::modalMitch Curtis2019-02-051-2/+6
| | | | | Change-Id: I598bffe4a7908b5731ea12076d8bafaa447b2b5d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: add more \sa links to Popup's pageMitch Curtis2019-02-051-1/+3
| | | | | Change-Id: I2ce6e2183e783c50655e67946d8bb607ba89f705 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: remove references to deprecated ApplicationWindow::overlayMitch Curtis2019-02-051-3/+2
| | | | | Change-Id: I87f6f89695708b60d5065621a58d6fc59dac4edb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QQuickMenu: don't give focus to disabled menu itemsMitch Curtis2019-02-043-2/+140
| | | | | | Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Menu: fix disabled sub-menu items being highlightedMitch Curtis2019-02-044-4/+227
| | | | | | | | | | | When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix font and palette settings in .conf files not being respectedMitch Curtis2019-02-048-1/+48
| | | | | | | | | | | | | | | | | | | | In 5.11, the font palette read from the qtquickcontrols2.conf file was respected. After some large architectural changes (around the time of 94780538) required to fix a crash, 5.12 stopped respecting these settings. This patch fixes the issue by setting the default font as the System scope font, because that's what QQuickControlPrivate::parentFont() uses as its fallback if no parent item has a font explicitly set. QQuickControlPrivate::parentFont() is used as the starting point for font inheritance/resolution for each control. The same fix is used for palettes. Change-Id: I706a9f109c9959b8ea6b91f842146dbfc876cb2b Fixes: QTBUG-72023 Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Fix Menu not being dismissed when the triggered item disables itselfMitch Curtis2019-02-043-1/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+11143
|\ | | | | | | Change-Id: I555418c45b33fa9bc02072b32736403090f1bdbc
| * QQuickAbstractButton: fix clicked() not being emitted after long pressv5.12.1Mitch Curtis2019-01-252-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a button is pressed long enough (QStyleHints::mousePressAndHoldInterval()) and there is a connection (e.g. signal handler) to the pressAndHold() signal, it is emitted. If nothing is connected to the signal, clicked() is emitted. Before this patch, QQuickAbstractButton used QObjectPrivate::isSignalConnected() to check whether or not anything was connected to pressAndHold(). The problem with this function is described by Olivier: "[...] there is an optimisation for the first 64 signals we store a bit in a 64bit integer to quickly see if a signal is connected. There is also the problem that it can return true even if the signal has been disconnected." This is also mentioned in a comment in the code: Returns \c true if the signal with index \a signal_index from object \a sender is connected. Signals with indices above a certain range are always considered connected (see connectedSignals in QObjectPrivate). When 5adce04 added inset signals to QQuickControl, it meant that signals in QQuickAbstractButton (which derives from QQuickControl) were pushed outside of that 64 signal range, resulting in the IS_SIGNAL_CONNECTED macro returning true. This patch fixes the issue by using QObject::isSignalConnected(), which does not use the 64 signal optimization. Fixes: QTBUG-72811 Change-Id: Ic6e54d6cab062e528522ef7e3cf27c1023d31347 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit bbc81363f082ab6a2736f8de83968a3941e367e2) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Add changes file for Qt 5.12.1Antti Kokko2019-01-131-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 33966b5b9b026f24ac94c0905280deb4d004df81 Stop using wildcards with "direct" RESOURCES syntax in examples + e236382e8cc1017597ae67bf739e91a2bd4dfd0a Bump version + 431d605edb48321c71935fbd2bb82d33e231ea55 Add changes file for Qt 5.11.3 + 8317e62c3e2381e6287c9a7e861d20f78aaea03f Fix compilation with qreal=float + 343cea9b49d7afa7614aea27aed7c48ef9c5be2e QQuickScrollView: override getContentWidth/Height() + 60a43aeba785e52b89fb65913f69101528401e53 Doc: Add qmake include flag for module + e25970ffff3db1d0b2de17510514b5f92c5ba3eb qquickfusionstyle: do not force a fixed blue color as highlight color + ccf9a78e366695ce4ac3b8040c034800469804a7 Doc: add "1" to all mentions of the old Qt Quick Controls + da55026c975093e9e1e4374d9930861bcffdf8bf Fix compilation with gcc 4.8 + 1dff93937db7b3be48fdedbb60449260221dedc0 Doc: clarify event handling + bbd6c9972206eccc4d2872be44db509ef716c351 Fix QQuickIconLabel's baselineOffset + 98b6f8eee9affce6df8be137068e49f88becb9ce Port QQuickComboBox to QRegularExpression + 70199a43a978649d87c5b2815808c4a04902c6e0 Fix for SpinBox crash in Qt Quick Designer + 05597ef3e576a7cc09d193cb46dba490b7886ec1 Doc: Update \titles with "Controls 2" in it + 021c6064addd168017e0e9eff17639669e2f85d1 tst_QQuickStyle::availableStyles(): Ignore case when checking paths on Windows + b943bbf91162ba8aad4a6c3b0c7ca2e944a26105 Make it visually clear which ComboBox item is the current item + 69f02184a9a71f3a5e2dd1ada12367ddccd29787 QQuickComboBox: update QRegularExpression wildcard code + 1006eb36e58832b7142d1dfacbd1f878938fc155 Add binary compatibility file for QtQuickĆontrols2 for Qt 5.12 + b563bd583a50442b52e47f8c5f149aebafb385f2 Fix TextField background not respecting control's width + 520657bdfa0aba68e31758c5952a01c45940cd8f Bump version Change-Id: Id659474f4566319efa559797fd07d0977dd5aff1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-089-4/+70
| |\ | | | | | | | | | Change-Id: I442b103e352bc49b35fb816104c87c112e2fd958
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 06:36:01 +0000