aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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.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>
* | | Adapt to new signature for QQmlJS::DiagnosticMessageLiang Qi2019-06-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | A result of qtdeclarative d4d197d06279f9257647628f7e1ccc9ec763a6bb. Following similar change in qttools 875a927b49b241e6a96f2c8aace8a9c69da04ce7. Change-Id: I0f11dbf09ffa3aeb7395e7a8eb6a38bcc5f60133 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | unblacklist passing testsDaniel Smith2019-06-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | These tests have not failed on the removed platforms for at least 60 days Task-number: QTBUG-76608 Change-Id: I0f49529cc567fcc8eaffbe06adb4b260cd1a9e06 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-251-7/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I2d141866c13046abaaa7eead1989372fa9fbc5de Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-223-8/+41
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-223-8/+41
|/| | | | |/ / | | | | | | Change-Id: I969e9957826a0e74650ae31b10cf8ca550f32891
| * | 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.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>
* | | | Fix installation of .png filesJoerg Bornemann2019-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content of AUX_QML_FILES must consist of valid file paths, not wildcard patterns. The wildcard will produce an invalid installation rule, and since qtbase/20e9422e069a27b7e29b54207447e6ca02b3a55a we're not ignoring installation errors anymore. Fixes: QTBUG-76378 Change-Id: I8498e3559c97cf502cf8b1a5823f1a6775ee2400 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-153-59/+67
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-153-59/+67
|/| | | | | |/ / / | | | | | | | | Change-Id: Id8cb931daffd3dd0f75c283a9adb98ddc976973b
| * | | 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>
* | | Qualify unqualified id lookup in controlsFabian Kosmale2019-06-1156-169/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparation for https://codereview.qt-project.org/c/qt/qtdeclarative/+/259561 and also avoids walking up the contexts Change-Id: I9f016b7346db088dfe1519924c9770e486b46ec9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | qquickattachedobject.cpp: Fix deprecation warningFriedemann Kleint2019-05-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | No longer use the deprecated overload of qmlAttachedPropertiesObject() taking an int id, fixing: qquickattachedobject.cpp:52:103: warning: ‘QObject* QtQml::qmlAttachedPropertiesObject(int*, const QObject*, const QMetaObject*, bool)’ is deprecated [-Wdeprecated-declarations] Change-Id: I32f1ab7469fab7065709759b7f50290763a4bf26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix deprecation warning about qmlAttachedPropertiesObject()Friedemann Kleint2019-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix: quickattachedobject.cpp:52:103: warning: ‘QObject* QtQml::qmlAttachedPropertiesObject(int*, const QObject*, const QMetaObject*, bool)’ is deprecated [-Wdeprecated-declarations] Change-Id: I3579dfd0c45849c70403b6cd573493f0022c8ddd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-117-101/+459
|\| | | | | | | | | | | Change-Id: I2d9537a060ecbed1cc51dbebcc20b09753e41330
| * | 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>
* | | Include qstack.h in qquickstackview_p_p.hUlf Hermann2019-05-081-0/+1
| | | | | | | | | | | | | | | | | | | | | We use QStack below. Change-Id: Ife39904e4e075a9ca5d79a529ca7abd3e3c74fce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-042-4/+4
|\| | | | | | | | | | | Change-Id: I687ae31ea78ae5a39066e5ea47ec1d661642a7cb
| * | 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>
* | | quicktemplates2: Fix compilationFriedemann Kleint2019-05-034-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | After qtdeclarative/325e6305b418ffe1dfb9a36c2516c6a8a3de5733, QML models are in a new module. Change-Id: Ifa98380d4febd212628fb4007a3cc9dce98c995b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-275-6/+73
|\| | | | | | | | | | | Change-Id: I26d74fad831ec1379b88742c577fea9e6b02f456
| * | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 14:40:58 +0000