aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-251896-218/+3323
|\ | | | | | | Change-Id: I61919fabd4a3a07ed374f2c3c1fae2d589d6e124
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-2313-47/+117
| |\ | | | | | | | | | Change-Id: I65b34cc9ac31ecf2b768ec8e45ac635df7e9cba4
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-1613-47/+117
| | |\ | | | | | | | | | | | | Change-Id: I932a1b1606975265e6affd50e161e58737404a0d
| | | * Make ToolTips wrapMitch Curtis2019-11-156-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the text will go outside the window. Change-Id: I3d50a195b1ee6c9b5d49952ef6c49d17c61372fa Fixes: QTBUG-62350 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | | * SplitView: refactor hover handling codeMitch Curtis2019-11-152-42/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't unset the hovered flag only to potentially set it again. - Generally simplify the code. - Move it into a new updateHoveredHandle() function so that follow up patches can call it from other places. - Add more logging to debug hover issues. Change-Id: Iaf06cfe1f556a3f30bd0e883ef504b3df2dbc8e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | | * SwipeView: fix issue where child items couldn't get focusMitch Curtis2019-11-154-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the focus property of the contentItem (ListView) to the focus property of the SwipeView itself. Change-Id: Ic410f7fb8db9fbb758b956dfe07e1b4265f5f687 Fixes: QTBUG-62401 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | | * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-141-0/+2
| | | |\ | | | | | | | | | | | | | | | Change-Id: I2e33f9f4f508b98c26659574135fba9ff721d53b
| | | | * 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>
| * | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16739ff340e66849cac15f862844cd314c42e9c3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-161849-6/+164
| |\| | | | | | | | | | | | | | | | | | Change-Id: I647fa31fafdaea46c341c515f97b7f793ddf4b31
| | * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091849-6/+164
| | |\| | | | | | | | | | | | | | | | | Change-Id: Ib14b8c77cefe7aaf5b11483d9a30b2ef05314598
| | | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-086-4/+29
| | | |\| | | | | | | | | | | | | | | | Change-Id: I551670d92af2bc96d5d8b8724bf5b280e94498c7
| | | | * 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>
| | | * | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051836-0/+0
| | | |\| | | | | | | | | | | | | | | | Change-Id: I4b970036bdb5d312b0dc5cb1bcbd8e161e3d4c7e
| | | | * 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' into 5.14Qt Forward Merge Bot2019-11-047-2/+135
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibf7cf09570e73ad2f314e9ce7acf1c766ac3f332
| | | | * 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.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>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0beaac915c2ee2809a553d6b00c10e664db3e85f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36d6e9653b09e8cd2917d4a710bbdc325fea5050 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-0911-129/+211
| |\| | | | | | | | | | | | | | | | | | | | | | Change-Id: I80f13e604dd492954c742e0ddaa7efa393776a62
| | * | | | Non-modal popups shouldn't set isTabFenceMarco Martin2019-11-043-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup is not modal, all the application's main content can still be interacted with, therefore should still be possible to navigate it with tab. This issue is particularly evident with Drawer, also commonly used as a sidebar, in which tab navigation should always work. Fixes: QTBUG-79501 Change-Id: I0e8ad2e1abe57b9617c6316efbfe2f296c91b592 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 3358362e61ef96b3922a438d0806561285c49230)
| | * | | | Fix Editable ComboBox's auto-completion performanceMitch Curtis2019-11-041-77/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we can call stringValue()/variantValue() without having to call object() first (see 67ef2583), we get huge performance gains and can remove a lot of the code added in a392194. Fixes: QTBUG-78858 Change-Id: I434d3a9d06c020545b5d2cf6731cb5a030418b71 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-0210-52/+202
| | |\| | | | | | | | | | | | | | | | | | | | | Change-Id: Ida6e83517802b1e970f755b2e2128b77f08a8d11
| | | * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-2610-52/+202
| | | |\| | | | | | | | | | | | | | | | | | | | Change-Id: I5da24592eb292ef4f430d734fec234166ce6e1e3
| | | | * | 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>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40bcecbdb79512a10c64009423f2bde5d767dff3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I738384e89cdf0409e48719080b1f9d34395005f0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66654b24f0d911fc4444052608df2489bc65e4c8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf63d70ac6f3e3144403ee27a55ba9190a2ecfb8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-027-7/+2549
| |\| | | | | | | | | | | | | | | | | | | | | | Change-Id: I89a29c7040e233314885eb37731f53dba8ed6c1a
| | * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-267-7/+2549
| | |\| | | | | | | | | | | | | | | | | | | | | Change-Id: If43d5edea9ec0d4beaa3336b3e9aeefc698c5e6b
| | | * | | Update plugins.qmltypes for 5.14Kai Koehne2019-10-217-7/+2549
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I0e421232f4335a7a351562f23134eccdd0b1c674 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5cbf5e5530ebb63a793bcbcdf776a95d2654668 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Non-modal popups shouldn't set isTabFenceMarco Martin2019-10-293-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup is not modal, all the application's main content can still be interacted with, therefore should still be possible to navigate it with tab. This issue is particularly evident with Drawer, also commonly used as a sidebar, in which tab navigation should always work. Fixes: QTBUG-79501 Change-Id: I0e8ad2e1abe57b9617c6316efbfe2f296c91b592 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie46ae357f905a35983eb9ed60e7f0783a3c5e3d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2019-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b20b3b8d80fd11344253d2f5f20c17a62baedab Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-1922-40/+137
| |\| | | | | | | | | | | | | | | | | | | | | | Change-Id: I770f99d20878ddf16ab3f4b1a5422e7192622f64
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 08:55:51 +0000