aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-121-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 335314146dece4fa86c661a4094a2f73e5e81a43 Doc: Fix documentation warnings for Qt Quick Controls 2 + 7d001497ddcda501c55aac35b4c7a60980d9c6b5 Fix flaky tst_qquickmenu test + 9310d5fb5285ae5eb4b94c01606791319b775b85 Container: Keep currentIndex at 0 when removing item 0 if possible + 7431b0549a9bb69f5f4a036fc931683dd4e20d2c tst_accessibility: Simplify role verification + c49bb5bda32477a878b6b82b99f853cef1340890 CursorDelegate: stop cursor timer when interval is set to 0 + 1427b243cb69768e7ce2e6ea3ad75619deac104b Don't unnecessarily transform keysequences into strings + 4259e99c1990dc88632b85d945e9093cca47a831 doc - use the correct attributions file + e23d4b68f3f3b1467f032e4ce3501dab0feb5fee Material: account for accent color in flat highlighted button's ripple + 33e590ea30931306e055fe4a6ae38da8b3fe3d0c Bump version + 783bfd2182f667817213faf3f54a285057bd2456 Add changes file for Qt 5.12.4 + 761df2ced0081905b4238c66783bb276f504cf3d Accessibility: Switch should have checkbox as role + 2ea51ddea2b903d8115648a89d56b1e4b551e660 Accessibility: Remove redundant checkbox role code + 48f587be28e8b46e93703d7a4393b915b224495f Doc: Add specs about focus property + 188773bd1383883cd7247b6ded0d0b1a41689155 Doc: correct name of property in snippet + bb88d84475f7c4bb69528da5096f4d2c91667a3c Add a test for having a ShaderEffect as a delegate + 7ded94bf0eb2b78f37bb9f84a0cc36e4ec520023 SplitView: fix preferredHeight not being restored in restoreState() + b00d649f109b080b7068c4a7a2a7731d7fb51ea1 Simplify test a bit and make it less error-prone (adding type-safety) + 463a55d9593d6b03e09db440008e8b9320a28bc5 Binary compatibility file against Qt5.13.0 for QtQuickControls2 + 13bdd61c6597586f62558ca337c193ce03db26cc Bump version + 3574033d526c0a78236148354e1f48d7b9aafe10 Bump version + ce7c431fb23157fa5125d1102a594de045818a72 Fix crash in QQuickContainerPrivate::removeItem + 4f5da1ed1dc1d294c1c79b9f6124cedeaa45c4b6 Doc: Replace example file lists with links to code.qt.io + 83813e43405109478769010acf2caf85a4229501 QQuickComboBox: emit countChanged signal when model is updated + 1d06eb3f8215b67c5061ee3a076df405724ff7ee Fix Flaky tests Change-Id: I856bfc432911684bc0057d1b196fc456ce8f4819 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-302-3/+42
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-302-3/+42
| |\ |/ / | | | | Change-Id: Ib1c507845cae7f354fe5a5fb9d71ee6963949bd0
| * QQuickTextArea: prevent changing size of background recursivelyWang Chuan2019-07-242-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the x/y position of background depends on the height/width of background and these values are not constant, the if statement in the method resizeBackground() will always pass. And since a change listener is set before calling setHeight()/setWidth() in background, these two method will always call resizeBackground() and then call themself recursively, that means the height/width of background will always be reset, no matter what value you set. [ChangeLog][QtQuick][QQuickTextArea] defer adding change listener and prevent changing size of background recursively in construction Fixes: QTBUG-76369 Change-Id: I2ec37cad7f35cb1c756276326fe69e860c6b8de5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-232-23/+23
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-232-23/+23
| |\ \ |/ / / | | _ | | Change-Id: I8c038d287f066f2935ba0bceef5dd078704fd276
| * Fix Flaky testsDimitrios Apostolou2019-07-222-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | QQuickComboBox: emit countChanged signal when model is updatedWang Chuan2019-07-113-0/+97
| | | | | | | | | | | | | | | | | | [ChangeLog][QtQuick][QQuickComboBox] countChanged signal now will be emitted when a new model is set to the ComboBox Fixes: QTBUG-75972 Change-Id: Ic26718453ba06ba284ac5903fc6f55ddf3523331 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-093-0/+3
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I354049c5c8edb36cb94afa4483ae177a736f2374 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-07-0418-41/+178
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-07-0418-41/+178
| |\ \ |/ / / | | _ | | | | | | | | | | Conflicts: .qmake.conf tests/auto/accessibility/tst_accessibility.cpp Change-Id: I0bc187e2a8edb4e357c1bf114dd9b1977d5c1e45
| * Fix crash in QQuickContainerPrivate::removeItemJüri Valdmann2019-07-031-0/+1
| | | | | | | | | | | | | | | | The count variable should be updated after removing the item. Fixes: QTBUG-76164 Change-Id: I141d720ffaa890002d98a7d2448adca9a7d7d2f3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I3d0cfbbd68b361f006a455e46e17e0da28823373
| * Add a test for having a ShaderEffect as a delegateJan Arve Sæther2019-05-221-0/+58
| | | | | | | | | | | | Change-Id: If4f3dca99638015b479509e4aa73e0190b1182ac Task-number: QTBUG-67343 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: correct name of property in snippetNico Vertriest2019-06-181-1/+1
| | | | | | | | | | | | Task-number: QTBUG-75558 Change-Id: Ic9856c6f6da4e0beefe2fe6f1bbaea8fdd67ea0d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Doc: Add specs about focus propertyNico Vertriest2019-06-181-0/+13
| | | | | | | | | | | | Task-number: QTBUG-75546 Change-Id: I6e672c3a8390c4cf10dc9576cc3bf1eb10a6246b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | |\ | | | | | | | | | | | | Change-Id: I589b709ab12bb2b55596079f53ef147a82f23a3e
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I2389ce274d609c13055e82408f38d30c6e921e5c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: If3c56e80803135ac7e1ce99033da8e3dd09ad7a9
| * | | Accessibility: Remove redundant checkbox role codeFrederik Gladhorn2019-06-132-11/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | To make switch work, the base class now returns checkbox when it has the checkable property. With that change, this is no longer needed. Change-Id: I41d8f774cb244f922b859fd9f2dde75913e965b6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| * | Accessibility: Switch should have checkbox as roleFrederik Gladhorn2019-06-132-1/+5
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-76356 Change-Id: I8f8e8331adbe741be2c893f2140d793d1b901434 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: Fix documentation warnings for Qt Quick Controls 2Topi Reinio2019-01-153-18/+18
| |/ | | | | | | | | | | | | | | | | | | | | - The correct module header name is QtQuickControls2 - Add dependency to qtgraphicaleffetcs - RangeSlider: Move \qmlsignal commands out of \qmlpropertygroup - Fix linking to content[Width|Height] for ScrollView Change-Id: I1636fef5f4365a8e9f80b0b8df17e78999bfd3f8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: account for accent color in flat highlighted button's rippleKonstantin Ritt2019-05-211-2/+1
| | | | | | | | | | | | | | According to https://material.io/design/components/buttons.html#text-button Change-Id: Ia36a676864a8f738d204cf8db9430b797f1f2f99 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * doc - use the correct attributions fileKavindra Palaraja2019-05-201-1/+1
| | | | | | | | | | Change-Id: Ib83e2ec925e0c37b40562aea7f11e09759ce3abc Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Don't unnecessarily transform keysequences into stringsUlf Hermann2019-05-162-1/+30
| | | | | | | | | | | | | | | | | | | | | | Otherwise we cannot interpret them as the original key sequence anymore. When passing them on they are interpreted as the number key that represents the numeric value of the key sequence enum. Change-Id: Idd94ef95bc693cb6d51162dd1994adc953b52e25 Fixes: QTBUG-75572 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * CursorDelegate: stop cursor timer when interval is set to 0Richard Moe Gustavsen2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cursor flash iterval can sometimes be set to 0. This is done from e.g the iOS plugin while selecting text, since the cursor should not flash when the user is dragging it around inside a magnifier glass. Setting the interval to 0 simply means "don't flash", rather than "hide the cursor". But setting the interval of a QML Timer to 0 will cause it to never trigger, which is not what we want, since then the cursor can end up staying hidden if done in-between two "flashes". This patch will add an extra condition that checks for this case. Fixes: QTBUG-75844 Change-Id: Ib1ca594a49a18cb161a2b2a67928fb6766984988 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * tst_accessibility: Simplify role verificationFrederik Gladhorn2019-05-141-50/+50
| | | | | | | | | | | | | | Instead of casting to int and back to enum, just use the enum directly. Change-Id: Ifbd6a74ee499ffaeb99b0b4274cd59365833bfbd Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Container: Keep currentIndex at 0 when removing item 0 if possibleJüri Valdmann2019-05-072-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | Current behavior is to always decrement the currentIndex when the current item is removed -- even when the current item is item 0. This means, for example, that in a TabBar with three tabs and the first tab selected closing the first tab will leave nothing at all selected. Change behavior to keep currentIndex at 0 if there are still items left in the container. Now closing the first tab will leave the next remaining tab selected. Change-Id: If4e1903366e29fcee8226b776d5b2e03cec189df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix flaky tst_qquickmenu testMitch Curtis2019-05-071-2/+3
| | | | | | | | | | | | | | | | | | | | The important part of the "cascading" test is checking that the sub-sub menu eventually opens, so move the !visible check to the non-cascading branch of the if statement. Change-Id: I5a09bf0b5d45832f7b75c3e8c397fdb9e6fcc011 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I838d61be2f84240b3aaf3b9658a0e0e337313470
* | Binary compatibility file against Qt5.13.0 for QtQuickControls2Milla Pohjanheimo2019-07-011-0/+11498
| | | | | | | | | | | | | | BC file added. Change-Id: I7aca8182bb24e0064d8b76e71ad7353a4988c2f7 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-203-8/+41
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-203-8/+41
| |\ \ |/ / / | | | | | | Change-Id: I76cc3f99ecaca3eebe49fd129e3b3562ebd6ea09
| * | Doc: fix import versions in SplitView documentationv5.13.0-rc3v5.13.0-rc2v5.13.05.13.0Mitch Curtis2019-06-042-8/+8
| | | | | | | | | | | | | | | | | | Change-Id: Ib491000bf2751f24e3dc635958bdf997193c225e Fixes: QTBUG-76077 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Add changes file for Qt 5.13.0v5.13.0-rc1v5.13.0-beta4Antti Kokko2019-05-081-0/+33
| | | | | | | | | | | | | | | Change-Id: I0dfa00105c0b0be152d6cba7093053a6316f67ef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Simplify test a bit and make it less error-prone (adding type-safety)Jan Arve Sæther2019-06-131-50/+50
| | | | | | | | | | | | | | | Change-Id: I1e8a6fec5af58ec7e94aaf20849ac3f48affb15f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | SplitView: fix preferredHeight not being restored in restoreState()Mitch Curtis2019-06-102-9/+17
|/ / | | | | | | | | Change-Id: Icc236494f5df382d6bc49092d23a460822c835a1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-047-101/+459
|\ \ | |/ | | | | Change-Id: I1ec3d930d4131ba6d1de687250c0f4f698946af4
| * Fix MenuItem width not matching Menu's available widthMitch Curtis2019-05-033-4/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Make tst_qquickmenu run with all stylesMitch Curtis2019-05-033-92/+180
| | | | | | | | | | | | | | | | | | This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Doc: bindings to x/y/width/height of contentItem aren't respectedMitch Curtis2019-05-031-2/+3
| | | | | | | | | | | | Change-Id: Idecee26bcae178ed294c062819f55e12a65af37d Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: fix currentText link, add more \sa linksMitch Curtis2019-05-021-3/+3
| | | | | | | | | | Change-Id: Ibde952a165c9e0fb40133ce554e90ba35c93feee Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix tst_cursor when running in Android emulatorMitch Curtis2019-05-032-4/+4
| | | | | | | | | | | | | | | | | | | | Explicitly set hoverEnabled to true on the ScrollBar to account for platforms like Android, where the UiEffects style hint does not include HoverEffect, and hence QQuickControlPrivate::calcHoverEnabled() would otherwise return false. Change-Id: Iee2b1f7c3ee8e5caf2a7b4f6695ab4dabd6b4753 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-254-4/+71
|\ \ | |/ | | | | Change-Id: Ibf39232616ea6ef67242b70011aa683ce8dc0b4f
| * 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.35.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>
* | | Fix building with qreal floatJeremy Powell2019-04-231-2/+2
| | | | | | | | | | | | | | | Change-Id: I02ebf4277142ef426194da0992b3348bd3c83998 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>