aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.1v5.15.15.15.1Antti Kokko2020-08-311-0/+49
| | | | | | Pick-to: dev 5.15 Change-Id: I25293c4357635590278bb018ffb71422b75192a1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* tst_qquickpopup: fix setOverlayParentToNull testMitch Curtis2020-08-261-0/+2
| | | | | | | | | Use the fix from 1d06eb3f8215b67c5061ee3a076df405724ff7ee. Fixes: QTBUG-86212 Change-Id: I407c56741806340235da81cca943b50cc6e92dd2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 4d76bce10d8f71dd3dc79e30ff947afe866c5041)
* QQuickSpinBox: fix another "function expressions as statements" warningMitch Curtis2020-08-202-1/+13
| | | | | | | | | | | This amends d5fbbddd7794265f24d392d33c4874ac756cb9c9 by also fixing valueFromText(). Task-number: QTBUG-64151 Change-Id: I02b053bb4d4579e86eaaa2279826f3b103800fdf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2d0794cbc73a6913bea075804f232c4996d5fc4d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Document that pop() does nothing if depth is less than or equal to 1Mitch Curtis2020-08-201-0/+3
| | | | | | | | | | | This note is already in the detailed description, but users looking at pop() can easily miss that. Task-number: QTBUG-85903 Change-Id: I92c71c8d98b2a83aefbc99229e5b16a6fb33b937 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 70686007ce8c5f237e3319525682bbb85c99c49e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SwipeDelegate: don't allow calling close() when pressedMitch Curtis2020-08-192-0/+51
| | | | | | | | | | | This conflicts with the behavior of SwipeDelegate. The released() or clicked() signals should be used instead. Fixes: QTBUG-85804 Change-Id: I06111b63941f54c06f0e1b828d17264f37d765d5 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 6f41c69c9bc5a0ce59444e40d3a55018f7994743) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SwipeDelegate: don't emit closed() when already closedMitch Curtis2020-08-192-2/+25
| | | | | | | | | | | If the mouse is released while our position is 0, it means we were clicked, and we don't need to begin any transitions to close. Fixes: QTBUG-85806 Change-Id: Ic521f48e2977c1a99dbecaa585792a7798b9d749 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit f3a64b13725081eb94b05dbeb5f68a2298c9163e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Prevent against re-entering prepareExitTransition after a focus changeAndy Shaw2020-08-192-1/+37
| | | | | | | | | | | | | | | | | | When a popup is hidden, then it will trigger a prepareExitTransition which can cause the active focus to be lost. If the popup's visibility is tied to that fact then it can retrigger the transition which means the active focus does not go back to where it should. Therefore, we check if hadActiveFocusBeforeExitTransition is false before going through that process as then it will only be called the first time the popup is hidden. Fixes: QTBUG-85884 Change-Id: I68054aeb48447617b4235ce6467514a17f1073ba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 1a5a0a591c35dcf498a232a802087683f2244ecb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility file for 5.15 for QtQuickControls2Milla Pohjanheimo2020-08-171-0/+11690
| | | | | | | Binary compatibility file added. Change-Id: I5cee4e537d40285c92c61963134656b3559abde5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Get the scale of the popup item when setting the parent itemAndy Shaw2020-08-174-8/+36
| | | | | | | | | | | | As there are some styles that will do an transition which animates the scale then we need to size and position based on the final scale it will have to avoid a jump after it has finished the transition. Fixes: QTBUG-84488 Change-Id: I4571eb18c921e81de319838ac0e8d3fe3513d438 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 64230bf97c18297f45bd5d7ccf99b510c8a612bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash on exit when centering Popup within Overlay in StackView itemMitch Curtis2020-08-164-1/+128
| | | | | | | | | | | | If a Popup is centered within an Overlay, and that Overlay is destroyed before the Popup, we must make sure centerIn is cleared so we don't try to access a dangling pointer. Fixes: QTBUG-84579 Change-Id: Icb2750f847f9d5710725bedc4d1c92bf4c122c03 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 04901b170e009d844232067446fdd56f270d155d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Support Markdown in the TextEditor example, including local pathsShawn Rutledge2020-08-117-6/+193
| | | | | | | | | | | | | The example still loads an HTML file from resources by default, but now it's possible to give either a relative or absolute file path on the command line to load an html, markdown or plain text file. Alternatively you can use the file dialog to load any of these types. We assume that any resources (such as images) with relative paths are to be loaded from the directory where the source text file is. Change-Id: I37bc2d6aa2306016453770dc2fd66efa41a16618 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 0672882cab3aa2fa9695b4d6b1b3e894c6fa6ebb)
* Remove bindings to parent in delegatesMitch Curtis2020-07-3017-17/+19
| | | | | | | | | | | | | | | | Until we've decided whether to a) document that properties of parent should not be bound to in delegates or b) fix the warning that results from doing so after 8c72e634b3b0eacbfdee883bfc34994d3c19ed77, we can pre-emptively clean up a few places where it happens. Task-number: QTBUG-81976 Task-number: QTBUG-82393 Task-number: QTBUG-82989 Change-Id: I1e610613f6016ec1b9cf9ca33cdfb15d384731a8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 456d26e97ec7745fdbd1afaaaa6c1dc217eca060) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I47c7b664afdba3e57d614db2cd324f11ae85d31c
* Doc: mention cache property in the relevant placesMitch Curtis2020-07-154-0/+5
| | | | | | | | | This was missed in 033564edf5b79e32da63597930e25105a3442f01. Change-Id: I7bc465338d5b9960ad7b746a816cd33efcca1bdc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit feabd686a31d257638d9cdc80c6dd36e8709e279) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove another binding to parentMitch Curtis2020-07-151-1/+1
| | | | | | | | | | | | | | | Similar to what was done in 456d26e97ec7745fdbd1afaaaa6c1dc217eca060. The warning was: Material/ComboBox.qml:68: TypeError: Cannot read property 'Material' of null Task-number: QTBUG-82989 Change-Id: Id82d62d6aca0c0e517d6f8630c51f54739aea95f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f6f42ddc724b9d01cac20632b3fda43a788d53ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix tst_QQuickMenu::subMenuPosition()Mitch Curtis2020-07-141-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4b61d6f52b166ca2b4a2e38a2fc60d631372f6a7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickApplicationHelper: don't use QTest macros outside test functionsMitch Curtis2020-06-187-5/+103
| | | | | | | | | | This has no effect. Task-number: QTBUG-66320 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 969a724352dfe3250efb871c70f9482d7b780165) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QmlDesigner: Fix DialSpecifics snap modeHenning Gruendl2020-06-171-1/+1
| | | | | | | | Task-number: QDS-2278 Change-Id: I74be7066b1bf2a0827a3fe7dca7b46e466ef8c58 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b9bf86f06fafec9c2aace64b05d1a5dfae24ea7e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing paletteChanged() to setForeground() in Material styleJoni Poikelin2020-06-081-0/+1
| | | | | | | Change-Id: I7396885688c6091a948f2865ff716e84f7f5195b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d3fd504b31a531f1bfcd9c3d34991357a36334ce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove the shortcut when the menu item that is using it is removedAndy Shaw2020-06-041-0/+10
| | | | | | | Change-Id: I58ae027a6a913f45f7b3fad020c290c4d75804da Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 6cadd6dc755b82f98bb4ff4f4336f63597d755b3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Sync the platform menu after inserting it to the menubarAndy Shaw2020-06-031-0/+1
| | | | | | | | | | By syncing the platform menu, we ensure that it passes on the title of the menu to the native handle if it was dynamically added. Change-Id: Idd11fa7d9cd3d251e2ed19f99f575f5e2ec5ac1d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit fc5bd87eb202edb3ede1f349da46c4c86ca82ca3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickTextArea: resize background different when inside FlickableRichard Moe Gustavsen2020-06-022-2/+38
| | | | | | | | | | | | | When a TextArea is placed inside a Flickable (using the TextArea.flickable property), the background is reparented to the Flickable. For this to look good, the background should have the same size as the Flicable as well, so it doesn't end up with the size of the TextArea, which can be many pages tall. Change-Id: I75ead02c712f337c7e743f17aa8810a040519173 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 257054f2cc6d79e763a12b350ffcc18787d0ac8c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* StackView: fix heap-use-after-free when pushing after clearMitch Curtis2020-05-294-20/+64
| | | | | | | | | | | | | | This patch extends the work done in aaec25a7 to cover all operations. Note also that b94889f4 does a similar thing to this patch and aaec25a7, in that it explicitly ignores operations that are done during the removal of elements. Fixes: QTBUG-84381 Change-Id: Id8bbbded39d8e58bcf0e8eedeb2dde794952333f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit b67cc148693de06370633cddf82a31664004e65c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Sync the QQuickPlatformMenu so it has a handle ready when its a sub menuAndy Shaw2020-05-291-2/+7
| | | | | | | | | | | | | When dynamically creating a menu, it will be parented after it has created the handle the first time around. Therefore it loses the original handle and does not get a new one when needed. So by calling sync() before it is set as the sub menu then it can get a handle created if necessary in time. Change-Id: Ia39f49f99758802dd19ff1df478b05ac5e403ea8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 7640c9988f37e49e12f56be7a30ea97170922b9f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Account for single key shortcuts being used in the platform menusAndy Shaw2020-05-283-1/+37
| | | | | | | | | | When a single key shortcut is used then it does not go through the usual channels for triggering. Therefore it needs to be registered as a shortcut so it can be picked up when sent as a Shortcut event. Change-Id: I93a48c633e1051f142b884d78bbca181c778f7b9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit cc3145b68cb0094caef30315205a0e62dcbb7ccf)
* Fix -no-accessibility buildPeter Varga2020-05-263-0/+5
| | | | | | | Change-Id: Icbae79fd0f48fb9351ee8cc12b35ead7e99b09e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 1f919391eee10e888a811ff1cd8676f55ca78692) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing overrideAlexander Volkov2020-05-251-1/+1
| | | | | | | Change-Id: I29af6f91ed90395ce3fdb92081d54a17f16d58e0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit e9265f22ac6b80ae508f1c21b819e07d733c407b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: explain how to allow Menu to move outside of the window via marginsMitch Curtis2020-05-211-0/+8
| | | | | | | | Task-number: QTBUG-82279 Change-Id: Ibc9bae71995f140882dd0f636ff360af8ac0337c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 26679453b26bed18d873fbbcc758dce112e22189) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* HeaderView: always use headerdata from syncView modelRichard Moe Gustavsen2020-05-201-7/+2
| | | | | | | | | | | | | | | | | | | | When HeaderView has a syncView, it should always use the header data of the syncView as model, and not only when that model is an QAbstractTableModel. Otherwise you cannot use headerView together width models like e.g QFileSystemModel (which is a QAbstractItemModel). If HeaderView has a syncView, but its model doesn't contain header data, then just leave the header empty. The application must either assign an model explicit to HeaderView, or provide header data to the syncView model. Just transposing the model will just duplicate the data in the syncView, which looks wrong. Change-Id: Ie48e960be8bf9fdd3ed227d90c6efb6aabfd18b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 4fe04f107d829434420ef44446a97938affd3420) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Listen for the LanguageChange event in event() instead of using filtersAndy Shaw2020-05-193-21/+8
| | | | | | | | | | | Now that the LanguageChange event is sent to all top level windows to pass on down to items then we can drop the event filter and just listen for it in the event() function. Change-Id: I6c9699a798680695ea1d0013266d3a034b74ae7b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 1f4f547a070356dda459a45b9f1c17fd4995d793) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Tests for Qt.labs.platform/MenuItem.iconIvan Tkachenko2020-05-152-4/+10
| | | | | | | | | | | Test that nested property icon.* can be used in this Qt.labs.platform version. Just checks that imports work and properties can be created. Task-number: QTBUG-84102 Change-Id: I450a7fa2c5f257a7e6e1b07630f05f7662964cd0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 7dd5ae3f45c49cbfcf87c5b6205e1d3482454c4d) Reviewed-by: Qt Cherry-pick Bot
* Fix Qt.labs.platform/MenuItem 1.1: expose iconIvan Tkachenko2020-05-153-4/+8
| | | | | | | | | | | [ChangeLog][Platform][MenuItem] Expose MenuItem.icon.* property when imported as revision 1, which was erroneously not exposed at all. Task-number: QTBUG-84102 Change-Id: I6d400c7d4e222b67c99b6f5a95ac66e0851630f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 8fdcde54e65f92a04c7165677e85168ceed1d20b) Reviewed-by: Qt Cherry-pick Bot
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+80
|\ | | | | | | Change-Id: Ic5231797ad701859e74c8844e7d32cf6882e071e
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+40
| |\ | | | | | | | | | Change-Id: I50e03756cb79ae5fb705a66403ca9f0b60c1df14
| * | Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+80
| | | | | | | | | | | | | | | Change-Id: I625235df49f5bb7209404ff760bb167905b82711 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | ComboBox: fix currentValue not being updated on model changesMitch Curtis2020-05-122-6/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we call updateCurrentValue() where necessary. Fixes: QTBUG-83554 Change-Id: Iad593c2fc094a26429de1eda91bbdb152ffee2c2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 3adeceaa1cfe5fae55ca6bd75226c52363a7e7d3) Reviewed-by: Qt Cherry-pick Bot
* | | QmlDesigner: Update properties in property editorHenning Gruendl2020-04-2712-8/+247
| |/ |/| | | | | | | | | | | | | | | Add missing and cleanup existing properties in property editor. Task-number: QDS-1502 Change-Id: I33259e244d5a4471e01f7fc1845ad05414367eae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+40
|\ \ | |/ |/| | | Change-Id: I13c6ded3e0b47e62f54d26650fa809737425ccdc
| * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+40
| |\ | | | | | | | | | Change-Id: I010803b48e830ad5528ac6afe2c53cb744f71e31
| | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-111-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a2443f0a34da85de014b9507926c4ac415543b03 Blacklist tst_QQuickMenu::popup on macOS + 28610e13e453c33d7118834a0effb7ac87427ffe Look for the fallback style in all of the style paths + 20b9437d54b16abfdd7528868dea2a6c6de0c349 set placeholderText by default, not text + c5c945006244b6bf5189f1949a009f70ebd51d7a Doc: fix RangeSlider errors + 33474ce5f16f418a8f132ba88b8cbd5b5d1edcca Follow QML2_IMPORT_PATH in path search + 1ee1fd16f09e72cbf3460904a1cf6314aa594927 Bump version + 91eb563b278ca9c831c444380030c458adbf02f0 Copy Qt Quick Designer-related files also for static builds + b10912ba731144e8c41cbfa35fb1553ad04b2b88 DialogButtonBox: don't change button text that has been explicitly set + 025f938c1b4676782674d54375e1e4e560e4b6cd Account for when a touch event is synthesized by Qt as a mouse event + e7a9691481e4a0112138f442c53107aa9fbcb90a clang-tidy: fix bugprone-integer-division + c1420ee5423dfa104d5ff87bc529b4530dc998d6 ToolTip: fix timeout not activating if opened during exit transition + 09476c590ab13623130d5ac79045fa68e504be96 Fix clicked() being emitted after doubleClicked() Change-Id: I527847c23524efc85e2961e75b68637e47675a08 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Update plugins.qmltypes for 5.15Jani Heikkinen2020-04-156-21/+98
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: I93ae7b51b902050020cf7a79510b8325060181c5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Material: revision sliderDisabledColorv5.15.0-beta4v5.15.0-beta3Mitch Curtis2020-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This amends 0d5a43fa8. Cherry-picked from branch: dev Change-Id: I68c500ae874c92467b414dbf37eec9d55b3c730f Reviewed-by: cherrypickbot
* | | tst_qquickheaderview: wait for window to be activeRichard Moe Gustavsen2020-03-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tst_QQuickHeaderView::listModel test fails on Ubuntu. From inspecting the build log, VerticalHeaderView has an empty size. Since HeaderView will only load items that end up visible in the view, it will load just one item in this case, even if the model contains five. Hence the test will fail when searching for the other missing items. Why VerticalTableView has an empty size is not well understood (and cannot be reproduced on my mac). The size is bound to the size of the window, which indicates that the window is not shown or ready by the time the test runs. So this patch will change how we create the window for the test, and wait for it to be active, which is standard procedure for many other tests. Hopefully this will also fix the test failure on Ubuntu. Task-number: QTBUG-83172 Change-Id: I7d3a188dbeb161f11eee7b95c103928404161f11 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | HeaderView: Add support for list based modelsAndy Shaw2020-03-2414-13/+194
| | | | | | | | | | | | | | | Change-Id: I411136bd2b9a277d84a7c68c55bb1c317b6cc9d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-218-26/+28
|\ \ \ | |/ / | | | | | | Change-Id: I9ecddc7a68da4f15ee2c2904e237496eb6a2aa26
| * | Doc: Make sure import is highlightedKai Koehne2020-03-204-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use \qml ... \endqml to allow qdoc highlighting the import as QML. Also parameterize the example import QtQuick.Templates import so that it always uses the last import version. Change-Id: I3fecc8b301c58a89769caf5aa3a764551ff683b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Menu: account for the scale when getting the size before positioningAndy Shaw2020-03-183-15/+17
| |/ | | | | | | | | | | Fixes: QTBUG-73687 Change-Id: Id2d6a6b5c6651337ab7ae26d07011160b79654bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: Fix highlighting of importKai Koehne2020-03-091-2/+2
| | | | | | | | | | Change-Id: Ic1f1583d6956180470ddd9d4869ea437c05be343 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Account for the padding around a menu when checking if it is interactiveAndy Shaw2020-03-187-5/+95
| | | | | | | | | | | | | | | | | | | | If there is padding around the menu then it will mean the available height is smaller than the containing item and as such should be interactive. Fixes: QTBUG-82473 Change-Id: Ie3e7568ab66aa3da93e5448c1a27c9bd2a5e486a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: Make Slider's track accent colored and semi-transparentPaweĊ‚ Gronowski2020-03-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | According to the Material Design guidelines Slider's track should be accent colored and semi-transparent. Additionally it should be a bit thicker. The original ticket in the bug tracker mentions it to be 2px 2px but I think that the 4px makes it look a lot more like the one presented in the guidelines (https://material.io/components/sliders/). Task-number: QTBUG-70768 Fixes: QTBUG-70768 Change-Id: I062c0938297ae877b37605b6d536e11b464d477f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>