aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Amend d1fec8f050fc8f60b2cc2bf0e22a1e478f0e9048 to account for the theme5.13Andy Shaw2019-11-111-0/+2
| | | | | | Fixes: QTBUG-79929 Change-Id: I153684fa9c4e40d220986391671b0945b66393e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Unset the resolved font's families if it was not set beforeAndy Shaw2019-11-085-4/+22
| | | | | | | | | | | | When the font is resolved, if the font does not have families set then it will set it to be the family to ensure that it has the right precedence. Therefore we need to reset the families setting so that it does not act like a font has changed after being resolved when it really hasn't. Fixes: QTBUG-79790 Change-Id: I03c6f1456dbe5f136181b1c3a0e22fdc0fa66679 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: advise against naming root resource dirs the same as style namesMitch Curtis2019-11-071-0/+7
| | | | | | | Task-number: QTBUG-59330 Change-Id: Ie983f27f2eca0bc9c906fb7bcfe9e077616ef88b Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Run optipng on all imagesMitch Curtis2019-11-041836-0/+0
| | | | | | | | find . -name "*.png" -exec optipng -o 7 -strip all {} \; Change-Id: I2238b2dd38813d33ed48d79817f872f922cfa28d Fixes: QTBUG-79275 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.13.2' into 5.13Qt Forward Merge Bot2019-10-302-1/+26
|\ | | | | | | Change-Id: I614ee6943ab5cff62cefb2de884af8cb02fe7f55
| * Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-151-0/+25
| | | | | | | | | | Change-Id: Ia035cc871e42646a8053d42ec0af2902a9a56acd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: Ie16762649a006dea1420c0df60ed80137491d4a9
* | QQuickPopup: try to grab shortcut when component completedWang Chuan2019-10-293-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If closePolicy of Popup is set to CloseOnEscape and the Popup is completed, shortcut will register to QGuiApplication to let Popup respond to Escape key. However if Popup is set to visible in creation, even if we set closePolicy to CloseOnEscape, the shortcut won't be registered. [ChangeLog][Controls][QQuickPopup] Fixed the issue that Popup doesn't respond to CloseOnEscape if the initial value of visible is true Fixes: QTBUG-79326 Change-Id: I90c6805e2b4d567a6e0d33d43a75fedcfc5416b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Fix import statement for QtQuick.TemplatesKai Koehne2019-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | Always show the latest Qt Minor version in the import statements for modules in QtQuick.Templates. For QtQuick.Controls this was fixed in commit b395f94. Fixes: QTBUG-76077 Change-Id: I0d63337f572fd23f0122df151f01bef2c8eab1dd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SplitView: fix issue where Repeater items were not createdMitch Curtis2019-10-292-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SplitView's contentItem is lazily created whenever contentItem() is called. When adding regular, standalone items, they will go through QQuickContainer::addItem(), which eventually calls contentItem(). This case works fine. Repeaters, on the other hand, call setTransparentForPositioner(true), which QQuickContainerPrivate::contentData_append() checks for, and instead of calling addItem(), reparents the Repeater to effectiveContentItem() with this line: item->setParentItem(effectiveContentItem(p->contentItem)); If this happens before the contentItem is created, then the Repeater has no parentItem and won't generate any items. So, instead of using the contentItem member directly, call contentItem() to create it if it doesn't exist. Fixes: QTBUG-79302 Change-Id: I258f7420d2fea843ed045d569f80e92fe1f507d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Docs: Update qmlmodule to use QtMinorVersion so that this version is always ↵Kavindra Palaraja2019-10-251-1/+1
| | | | | | | | | | | | | | | | | | up to date Fixes: QTBUG-76077 Change-Id: Ica06051a8ca5dc3858110f5eef47fec20bd2d2c1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickContainer: stop creating duplicate content itemsMitch Curtis2019-10-242-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | In most cases, getContentItem() will create a new content item when called. In addition, its only responsibility is to return the content item, not set it as the control's new contentItem; QQuickControl::contentItem() does that. Instead, QQuickContainer should simply call contentItem(). Change-Id: I1b8cb57f9f7b9e56074e99bed20ce5bcac70e1a6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | tst_splitview.qml: remove unused SplitViewsMitch Curtis2019-10-241-17/+0
| | | | | | | | | | | | | | These make debugging SplitView issues very confusing. Change-Id: Iea09bd5339044ac330188233286acc695e335283 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | SplitView: fix cursor shape staying as Split*Cursor in some casesMitch Curtis2019-10-241-15/+11
| | | | | | | | | | | | | | | | | | | | | | Don't return early before restoring the ArrowCursor shape. This is not testable in QML due to QWindow's cursor API not being available there. Task-number: QTBUG-79302 Change-Id: Idb59d9cfbf04fc12ebe0adfbb7285ae7155e195d Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | texteditor: update links in html fileMitch Curtis2019-10-241-8/+7
| | | | | | | | | | Change-Id: I7e3bd670039d181fb562967c5e9d3830f63d46a3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | QQuickMenuBar: let MenuBarItem lose highlight when Menu is dismissedWang Chuan2019-10-244-5/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding new MenuBarItem to MenuBar, MenuBar will first check the Menu pointer in MenuBarItem and then connect the Menu's signal [aboutToHide] to MenuBar's slot [onMenuAboutToHide] to unhighlight the MenuBarItem. In case of adding dynamic Menu, this operation will be performed before setting new Menu to MenuBarItem. So the Menu pointer in MenuBarItem is null, and the connection will not be performed. [ChangeLog][Controls][QQuickMenuBar] Fixed issue with dynamically menu bar items not losing their highlight when their menu was dismissed. Fixes: QTBUG-77306 Change-Id: Ibe987462505f65747b4290b3c206e9dfbcbbef57 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix tst_qquickpopup failure on Windows 7 MinGWMitch Curtis2019-10-231-0/+2
| | | | | | | | | | | | Change-Id: I42b6a7050886f795e267893aa5eeaaf7a5841971 Fixes: QTBUG-79370 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Fix assertion failure when hiding a SplitView with only one itemMitch Curtis2019-10-232-4/+24
| | | | | | | | | | | | | | | | Check for -1 when calling handleIndexForSplitIndex(). Change-Id: I81021b64265ace0c47269ea54e538a2725c84b79 Fixes: QTBUG-79270 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | tst_qquickpopup: ignore ShaderEffectSource warning in debug buildsMitch Curtis2019-10-111-6/+8
| | | | | | | | | | | | | | | | | | | | It was commented out but should have been #ifdef'd, and the explanation is wrong. This amends 83fbf44. Change-Id: Ibe752d63a42805361b13edc6beafcf1f3738f02f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Universal: disable wrapping for TabBarMitch Curtis2019-10-111-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | The wrapping behavior makes for a poor user experience. Use ListView as other styles do. [ChangeLog][Universal][TabBar] Disabled wrapping. The Universal style TabBar now behaves like TabBar from other styles. Change-Id: I0a37490cdc2b81ff864ec682256f469a1a930628 Fixes: QTBUG-50027 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Add translation auto test to auto.proMitch Curtis2019-10-111-0/+3
|/ | | | | | | This amends c18c7bd7f9596e5ad3d13876a91203e1ceba2544. Change-Id: I29b48d9c8e5889bb67ea3cbc14821b5621868b6f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Imagine: fix crash when switching between 9-patch and regular imageMitch Curtis2019-10-025-2/+69
| | | | | | | | | | | | | | | | | | | | | Consider the following changes in source: normal.png => press.9.png => normal.png => focus.png If the last two events happen quickly, pixmapChange() can be called twice with no call to updatePaintNode() inbetween. On the first call, resetNode will be true (because ninePatch is not null since it is still in the process of going from a 9-patch image to a regular image), and on the second call, resetNode would be false if we didn't have this check. This results in the oldNode never being deleted, and QQuickImage tries to static_cast a QQuickNinePatchImage to a QSGInternalImageNode. Only change resetNode when it's false; i.e. when no reset is pending. updatePaintNode() will take care of setting it to false if it's true. Change-Id: I614c172c3e24fda2506f081f8fcdb6acd1c65fb8 Fixes: QTBUG-78790 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: Rename section called StackViewNico Vertriest2019-10-011-1/+1
| | | | | | | | - a section title in a tutorial shouldn't be the name of a QML type only Task-number: QTBUG-78799 Change-Id: I661b639eb96926be2b92899fdbe241890d4ed6f4 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix a crash on exit when using ToolTip in a specific item hierarchyMitch Curtis2019-09-303-1/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickPopup connects its parent item's (MouseArea, in this case) windowChanged() signal to QQuickPopupPrivate::setWindow(). It does this so that: 1) QQuickOverlay can keep track of all of the popups that it manages. 2) Fonts, palettes and locales can be resolved. 3) If the QQuickPopup component has completed loading and the popup is visible with a valid window, start the enter transition. The problem arises only when using a very specific item hierarchy: Window { width: 640 height: 480 visible: true Item { anchors.fill: parent Item { anchors.fill: parent ColorOverlay { source: parent anchors.fill: parent } MouseArea { anchors.fill: parent hoverEnabled: true ToolTip.visible: containsMouse ToolTip.text: "ToolTip text" } } } } When the window is closed and hence begins to be destroyed, the following events occur: - QQuickWindow's destructor is called. - The window's root item (QQuickRootItem) begins destruction. - QQuickOverlay is destroyed. - QQuickWindow's destructor is done, so the QWindow and then QObject destructors are called. - The QQuickItem destructor for the outer Item is called. - The child items of the outer Item have setParentItem(nullptr) called on them, one of which being the inner Item. - The inner Item's setParentItem() function calls derefWindow(), which in turn calls derefWindow() on its children. One of those children is MouseArea. - Since the MouseArea's window is deref'd, it emits the windowChanged() signal. MouseArea is the parentItem of the popup, so its windowChanged() signal causes QQuickPopupPrivate::setWindow() to be called. - setWindow() tries to remove the popup from the old overlay, which has already been destroyed. One approach I tried involved using QQuickOverlay::itemChange() to remove all of the popups (via setWindow(nullptr), to ensure that their window pointer is nullified), since that was called much earlier than the windowChanged() signal is emitted. However, this still resulted in a heap-use-after-free in the same place when running the newly added setOverlayParentToNull() test. I also tried removing the popups in QQuickOverlay's destructor, but this resulted in another heap-use-after-free (when accessing a popup in the destructor) in tst_QQuickPopup::Universal::visible(). The remaining options were: store the window in a QPointer or return early in overlay() if the wasDeleted member of the window was true. Using QPointer seems like it would catch more issues than a single check in overlay(), so I went with that. Fixes: QTBUG-73243 Change-Id: Ieb5ce26dd76d45771d28297031ec43e27d958b5b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickToolTip: fix setTimeout() behavior when tool tip is visibleKonstantin Ritt2019-09-272-1/+11
| | | | | | | by applying the passed timeout value prior to re-starting the timer Change-Id: I27953dbb4781b5cb0c2039d56faa56f3c000206f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Tumbler: fix displacement calculation when wrap is falseMitch Curtis2019-09-242-6/+38
| | | | | | | | | | | | Use the position of the item and the currentItem in the calculation in order to get reliable results. This fixes the displacement being off by a small margin, which increased as the delegate height became smaller. Fixes: QTBUG-66799 Change-Id: Ieca5033fb4c0ed62f5965a21fcab7aa558bd40e6 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: clarify autoRepeat/pressAndHold() behaviorMitch Curtis2019-09-241-0/+4
| | | | | Change-Id: Ia0dea6060be7ffd1c4a16348f166e7cde7ef2df2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* TextArea: prevent changing size of background recursivelyKonstantin Ritt2019-09-192-7/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 `resizingBackground` guard wasn't checked, any geometry change will always call resizeBackground() and then call themself recursively (via the change listener), that means the height/width of background will always be reset, no matter what value you set. Another part of the issue was in determining the extra bits too late: in case the background gets parented by the flickable, the new child caused the flickable to re-calculate its metrics and thus resize the background *prior* to remembering if it has w/h set. As a side effect, this fix also brings the possibility to reset previously set w/h to get the default background sizing behavior. Inspired by da06da57002b64cf4bcde0ca708b3275a5f919ae [ChangeLog][QtQuick][QQuickTextArea] prevent changing size of background recursively in construction Fixes: QTBUG-76369 Change-Id: Ide51ec1ebab63605ae3bfcc10a76a28be960ef36 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Revert "QQuickTextArea: prevent changing size of background recursively"Konstantin Ritt2019-09-192-42/+3
| | | | | | | | | This reverts commit da06da57002b64cf4bcde0ca708b3275a5f919ae. Reason for revert: the change removes symptoms leaving a cause unfixed Change-Id: I0a91409230c521da73ed53e2a00a4ccd8dca7335 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* TextArea: correctly resize background when there is no flickableKonstantin Ritt2019-09-131-1/+6
| | | | | Change-Id: Idaf385d12ca9388c0bb0b3f8a47c8e75c620b7eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Blacklist tst_focus::policy on OpenSUSE 15.0Mitch Curtis2019-09-131-0/+3
| | | | | | Task-number: QTBUG-78261 Change-Id: I5373ffbb21f70f4fc9f18a7574165f383f55d899 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* QQuickOverlay: micro optimization for disabled multitouch supportKonstantin Ritt2019-09-131-6/+14
| | | | | | | | avoid checking every press event to be one of touch events type when touch events are not delivered at all Change-Id: I1ed91fa124608d8a006cf2f5256ad68294dd465f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix timer events handlingKonstantin Ritt2019-09-122-1/+7
| | | | | | | | if the timer event's timerId isn't recognized, make sure control passes to the base class Change-Id: If5988dbf4ccda6a9887805961b439f93640f71ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* DialogButtonBox: fix standard buttons not being translatedMitch Curtis2019-09-116-1/+247
| | | | | | | | | | | | | When calling QQmlEngine::retranslate() after component completion, buttons in a DialogButtonBox were not being retranslated. For now the only way to be notified of language change events is by installing an event filter on the application, but in the future we can use the solution to QTBUG-78141 instead. Change-Id: Ibc435c3829945489adcbaa8a813013fe735a9c38 Fixes: QTBUG-75085 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QQuickIcon: prevent detach-ing when there is nothing to changeKonstantin Ritt2019-09-102-1/+14
| | | | | | | saves a bunch of pointless detach attempts on each deep-copy Change-Id: Ibb1ae99bd54b2d35f9c9aa9e541fb03891ad94ec Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickIcon: properly resolve implicit values - take 2Konstantin Ritt2019-09-101-6/+6
| | | | | | | | | | | This is a follow up of 382531ab5e2270833d3805c57c00ebcf6b24d635, and amends 1241c80eca725c9ac46a0b94d6bdec11a5d00302 . when the property has not been set explicitly, the resolved mask must not contain a respective bit set either Change-Id: I45a334b51fce09ead8e30fe3326a94f35b0f4f56 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-083-6/+40
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-083-6/+40
| |\ |/ / | | | | Change-Id: Ifa88045268cdaa1adc0b1e206d5e20a3721d3837
| * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+28
| |\
| | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+28
| | |\ | |/ / | | | | | | Change-Id: I9f62c952a3a059601c1486806c0fb4189ffc368d
| | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-261-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 335314146dece4fa86c661a4094a2f73e5e81a43 Doc: Fix documentation warnings for Qt Quick Controls 2 + 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 + 3574033d526c0a78236148354e1f48d7b9aafe10 Bump version + ce7c431fb23157fa5125d1102a594de045818a72 Fix crash in QQuickContainerPrivate::removeItem + 1d06eb3f8215b67c5061ee3a076df405724ff7ee Fix Flaky tests + da06da57002b64cf4bcde0ca708b3275a5f919ae QQuickTextArea: prevent changing size of background recursively Change-Id: I139ae9181197f900aab385bd0a93c6902d3b22f1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QQuickIcon: properly resolve implicit valuesKonstantin Ritt2019-09-062-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | when the property has not been set explicitly, the resolved mask must not contain a respective bit set either Change-Id: Iab0bd600b5bf458e26ed4601d4d2f608021f1518 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-061-0/+31
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-061-0/+31
| |\ \ \ |/ / / / | | | | | | | | Change-Id: Ifc5dd206734f3d6a64d106fa38e14139f52274b7
| * | | 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>
* | | | tst_dial: fix copy-paste mistakeMitch Curtis2019-09-061-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Slider was incorrectly used in a03b6fec6. Change-Id: Ib76172f9ea0dca3b776a74df2329bd63c72f8517 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-067-39/+93
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-067-39/+93
| |\ \ \ \ |/ / / / / | | | _ / | | | / Change-Id: I859406dc779e59ee5d8e2980e04f8be28b1a69aa
| * | | ComboBox: document the behavior surrounding the accepted() signalMitch Curtis2019-09-062-18/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65be8e54ded284d2f80b5a1f301b75223bd81bb3 Fixes: QTBUG-75338 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | Fix flakiness in tst_qquickdrawer testsMitch Curtis2019-09-062-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although it's not ideal to add arbitrary delays to tests, it does reflect a more realistic testing environment, and more importantly, seems to fix the flakiness on OpenSUSE. (cherry picked from commit 97fc102cd079f32cc1a4f00a764ceea981699fc0) Fixes: QTBUG-77946 Change-Id: I2998611759106386091d7375b31e56523c95371f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>