aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fusion: fix type registrationJ-P Nurmi2017-09-121-2/+3
| | | | | | | | | | | When the Qt version was bumped to 5.11, QtQuick.Controls.Fusion 2.3 became 2.4 and the 2.3 import was no longer available. We have to combine the QT_VERSION_MINOR based qmlRegisterModule() with a hard coded version that keeps the old version 2.3 available. Task-number: QTBUG-63149 Change-Id: Ie268fa52282342930349f6b7c46052964e7073c2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-09-1111-20/+61
|\ | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquicklabel.cpp src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextfield.cpp Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
| * Fix font inheritanceJ-P Nurmi2017-09-114-9/+12
| | | | | | | | | | | | | | | | | | | | In item views, it can happen during incubation that a control doesn't yet have a window associated when the parent item changes. Therefore we must make sure to resolve the font when the window changes. Task-number: QTBUG-63119 Change-Id: I890f70ae6faa232dcc2c094ccec02e76b371d2cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fully qualify atan2 with the std namespaceJake Petroules2017-09-081-1/+1
| | | | | | | | | | | | | | | | This fixes the build on VxWorks Change-Id: I5ba3d182184151b62e3ed6c0ab5e4d77a0e66768 Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * Fix non-modal drawer drag/swipe open and closeMichal Policht2017-09-062-1/+26
| | | | | | | | | | | | | | | | | | | | Function QQuickPopupPrivate::blockInput() has been overridden in QQuickDrawerPrivate to accept events that occur while mouse/touch is grabbed and events within drag area. Task-number: QTBUG-59652 Change-Id: Icf4129e702a351b266ea9c4544830185c315fc37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Android: fix clang compilation with -qreal floatVyacheslav Koscheev2017-09-013-6/+6
| | | | | | | | | | Change-Id: Ica7a417aa1bb531bc63e3fa9dda0505a6e552b67 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * QQuickSpinBox: fix initial value validationJ-P Nurmi2017-08-291-2/+4
| | | | | | | | | | | | Task-number: QTBUG-62508 Change-Id: I8981968c02b65d4b005eb9b54b0228fd51a3abda Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix a crash with ScrollView + TextAreaJ-P Nurmi2017-08-292-1/+9
| | | | | | | | | | | | | | | | | | TextArea was not cleaning up its geometry change listener on the Flickable it was attached to. Task-number: QTBUG-62292 Change-Id: I31223d4fcf0b46235b18e8eb05bab686a32f5481 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: add explicit importsJ-P Nurmi2017-09-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | To avoid problematic implicit imports: ASSERT failure in QQmlImportDatabase::importDynamicPlugin: "Internal error: Plugin imported previously with different uri", file qqmlimport.cpp, line 2072 Task-number: QTBUG-63037 Change-Id: I099bd88c6350853d3f0f525a7d9b8823f1f28f86 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Register new base class revisionsJ-P Nurmi2017-09-061-0/+5
| | | | | | | | | | | | | | | | QQuickText & QQuickTextEdit have gained new properties in QtQuick 2.10. Make them available in QQuickLabel and QQuickTextArea, respectively. Change-Id: I5156b683efeedd24b23c18d1c2e2509d3040b647 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump QtQuick 2.9 imports to 2.10Mitch Curtis2017-09-06273-273/+273
| | | | | | | | | | Change-Id: I274146911cd8a204fcbf439da9259b0a38c8092e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: move qtquickcontrols2-applicationwindow-wireframe.pngJ-P Nurmi2017-09-041-0/+0
| | | | | | | | | | | | | | | | d375a74 accidentally placed the image to a wrong place. Move it together with the other doc files. Change-Id: Ibdc35c8fad25ee4a8da4875c6e1ce494cfd3a570 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2017-09-0112-54/+94
|\ \ | | | | | | | | | Change-Id: I581d64b0c3fbf98750756c9386c6166051834252
| * | QQuickTabBar: optimize layoutingJ-P Nurmi2017-09-011-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickTabBarPrivate::updateLayout() was being called quite many times during the creation. This patch reduces the amount of calls significantly and gives a little boost in qmlbench too (~133 => ~140). Change-Id: I6f8b31919cdc1a5e6cf4d133c5e55e400f3f8c26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Make use of QQuickItem::ItemEnabledHasChangedJ-P Nurmi2017-08-314-31/+48
| | | | | | | | | | | | | | | | | | | | | | | | It was added in qtdeclarative commit 286f14f1. Getting rid of the slow QObject::connect() gives a little boost of 1~2 frames in qmlbench. Change-Id: If027fe2bee9eedad572afe8828b302c2f44cffac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Fix accessibility-related performance regressionsJ-P Nurmi2017-08-315-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before 089dd16f, we had a QQuickControlPrivate::accessibleAttached member that indicated whether accessibility was active. Since 4be38ab in qtdeclarative, it was possible to access QQuickAccessibleAttached:: attachedProperties() directly, but we ended up accidentally accessing it even when accessibility was not active, which added noticeable overhead. This improves those qmlbench test cases that call accessibility-aware setters such as QQuickAbstractButton::setChecked() a lot. For example, the test cases for CheckBox and RadioButton create large amounts of controls with a "checked: index % 2" binding. - CheckBox: 84 => 93 frames - RadioButton: 98 => 113 frames QAccessible::setActive(true) only notifies the observers, but does not really make accessibility active in the sense that the consequent calls to QAccessible::isActive() still return false. tst_accessible had to be changed to use QPlatformAccessible::setActive() instead. Change-Id: I8fd0fe2dddfd5633ce22a080bcda459f2d6e443e Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | ColorImage: colorize only if neededJ-P Nurmi2017-08-306-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickColorImageProvider got replaced by QQuickColorImage in 9fc3659. This seems to have introduced a performance regression in several controls that are now colorizing images even when there's no need to. Various indicator images have the correct default color that matches the normal state. They need to be colorized only when gaining focus or being disabled, for example. The improvement in qmlbench results: - CheckBox: 70 => 84 frames - ComboBox: 88 => 92 frames - Dial: 73 => 77 frames - MenuItem: 73 => 84 frames Change-Id: I9155042542f5069cff201a1730b9dd2a62cffd67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add ApplicationWindow::menuBarJ-P Nurmi2017-08-312-27/+116
| | | | | | | | | | | | | | | | | | | | | A follow-up commit to 66faa149. Change-Id: I94c92752d54ae0ca4878da72915b3d83461a4124 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | qquickapplicationwindow.cpp: de-duplicate item change typesJ-P Nurmi2017-08-311-12/+9
| | | | | | | | | | | | | | | Change-Id: Id2eb59bd696c408335813a27f393350d331f526f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Material: TextField hover effectBoris Moiseev2017-08-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corresponds to Hover controls state as shown in Material guidelines https://material.io/guidelines/components/text-fields.html#text-fields-states Change-Id: I8745c265e2ce71aa36d5877cfdf5cbfb018fb650 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Boris Moiseev <cyberbobs@gmail.com>
* | | Material: position TextField background independently of bottomPaddingBoris Moiseev2017-08-291-1/+1
|/ / | | | | | | | | | | | | | | | | | | Currently Material background bar is positioned at the center of control bottom padding. When user tries to change the bottomPadding for instance of TextField, the background bar may be aligned incorrectly with field text. Change-Id: I901e4351374aa228a59414e91f6d1ae61ae164a1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SwipeDelegate: grab the mouse when accepting a press eventShawn Rutledge2017-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 1f4bfc099b7e48e2cc3dd9488b7b42a96122b299 in qtdeclarative, QQuickWindow does not cause the Item to which it's about to attempt to deliver an event to pre-grab. (That caused a lot of thrashing of the grabber, so not doing that is a nice simplification, and also avoids the need to ungrab later, and also makes mouse event handling more like touch event handling.) So whenever SwipeDelegate knows at the time of mouse press that it wants to see the release too, it should grab. The grabber can be either the Item for which it's filtering events, or the SwipeDelegate itself, whichever is more appropriate in any given scenario. For now I assume it should be the delivery-target Item, because that's what would have had the grab before. Task-number: QTBUG-62412 Task-number: QTBUG-62631 Change-Id: Ie01276508c6602b10f9d7996a748ffe90efa36b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | QQuickStyle: fix warning about empty filenameMitch Curtis2017-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 0dee566e98f5ff4f224e596de1c04de4f9685df4 (in qtbase) added a check for empty file names to QFileSystemEngine, and we run into that: Empty filename passed to function The fix is to check for empty file names before calling QFile::exists(). Change-Id: I273ea62f97ddcbf5b1a7952405a67ccb45c7672a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-156-16/+65
|\| | | | | | | | | | | | | Conflicts: tests/auto/popup/tst_popup.cpp Change-Id: I32e6c6b646a00f8805cb82d181417db60a6fe6c8
| * StackView: Resolve relative urls in initialItemAlessandro Portale2017-08-071-0/+3
| | | | | | | | | | | | | | Check whether a URL is relative and try to resolve that. Change-Id: I6b0f7bca2011356aca5071d20dbd270eb5d115bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: fix custom SpinBox snippetMitch Curtis2017-07-311-2/+2
| | | | | | | | | | | | | | | | The snippet fails when pasted to a file where its not the root item, so qualify the binding with the control's id. Change-Id: Ibd16beaddafb112d1d9ecfad6914021ca9bdeede Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix QQuickPopupPositioner::reposition()J-P Nurmi2017-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | f1e139b broke popup flipping. Many of the sub-menu positioning tests start failing when merging 5.9->dev. The intention was to avoid calling mapToScene() twice and re-use the already mapped rectangle, but the flipping code needs the requested Popup coordinates, whereas the mapped rectangle is conditionally using PopupItem coordinates, so re-using the mapped rectangle is not possible after all. Change-Id: Ic00e985d937fce7aadfd24f817a06fd86d9e307d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Popups: take Window::contentOrientation into accountJ-P Nurmi2017-07-273-12/+54
| | | | | | | | | | | | Task-number: QTBUG-62158 Change-Id: I0bcf5b02da6a3500e4324462d5f1249a6178c9fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix QQuickStackViewPrivate::viewItemTransitionFinished()J-P Nurmi2017-07-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | ~QQuickStackElement() emits QQuickStackViewAttached::removed(), which may be used to modify the stack. Set the status first and make a copy of the destroyable stack elements to exclude any modifications that may happen during the loop. Task-number: QTBUG-62153 Change-Id: I144acd693519e637b78f9a2d910e83da8f2d779e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix build when OpenGL is disabledJake Petroules2017-08-071-1/+1
| | | | | | | | | | | | | | | | This fixes a regression from 846a908. Task-number: QTBUG-62289 Change-Id: Ia8eabf67a1d71d3d45a7574103d8dafddbfb9367 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Imagine: add missing information to .qdocinc includesMitch Curtis2017-08-021-2/+11
| | | | | | | | | | | | | | | | - Supported environment variables - Supported configuration file options Change-Id: I0324f410fcf89667ea42d3fcf5a3749c2c3779fb Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Improve "Qt Quick Controls 2 Configuration File" documentationMitch Curtis2017-08-021-4/+21
| | | | | | | | | | | | | | | | | | - Added sections to make it possible to link to them from other pages - Added section for the Imagine style - Improved wording Change-Id: I3e5e01a73d7411ee5e156f8f934d699ce57e00d4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Imagine: document supported animated image formatsMitch Curtis2017-08-021-1/+2
| | | | | | | | | | Change-Id: I0c7b788c79882d25c74b95e54a9d1f0ce67f29a5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Imagine: create image for customization doc sectionMitch Curtis2017-08-023-1/+1
| | | | | | | | | | Change-Id: I28b80f65404003281825d04ec26d9be8886c0ed9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Imagine: document 9-patch imagesMitch Curtis2017-08-028-2/+63
| | | | | | | | | | Change-Id: I3791c48128aef011a89446ef443ba15ee990b112 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Fix dereference after null checkJesus Fernandez2017-08-021-1/+4
| | | | | | | | | | | | | | | | | | | | CID 182271 (#1 of 1): Dereference after null check (FORWARD_NULL) 5. var_deref_model: Passing null pointer item to setParentItem, which dereferences it. Coverity-Id: 182271 Change-Id: Ifd7dcf58b58271c9b5e2f461f68153aaed4b97a2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add Imagine styleJ-P Nurmi2017-07-311314-1/+6974
| | | | | | | | | | | | | | | | | | | | | | | | | | The Imagine style is based on image assets. The style comes with a default set of images, but the images can be easily changed by providing a directory with images using a predefined naming convention. [ChangeLog][Controls] Added the Imagine style, which is based on image assets that can be provided using a predefined naming convention. Task-number: QTPM-517 Change-Id: I550d7dac9a9686d60bec15655ac92dea9f36149c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix qdoc linking errorJ-P Nurmi2017-07-271-1/+1
| | | | | | | | | | | | | | | | | | qtbase commit 237c867 removed the "Fusion Style Widget Gallery" topic. Link to "Qt Widget Gallery" which contains a screenshot of the Fusion style. Change-Id: I59a7fe238ea2090fed76a1ce022e7b844083e925 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: update MenuBar in the type comparison tableJ-P Nurmi2017-07-271-1/+3
| | | | | | | | | | Change-Id: Icb63953315926d0126d2154ef2942791726621fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Introduce MenuBarJ-P Nurmi2017-07-2631-12/+2109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MenuBar is an ordinary Item. It can be located basically anywhere, but the idea is to introduce a new ApplicationWindow::menuBar property in a follow-up commit. Currently the example snippets are using the header property. [ChangeLog][Controls][MenuBar] Introduced a MenuBar control. Task-number: QTBUG-60350 Change-Id: Ie66dc457a3d8edbe8362fab2a591dc49442c95e2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: make sure to stop the hover timer when closingJ-P Nurmi2017-07-211-0/+2
| | | | | | | | | | | | | | | | This seems to be one of the reasons why tst_QQuickMenuBar has had troubles in a busy CI environment. Change-Id: Ifa20c309eac86e8f47ba0a8c3da76a58f00465cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-07-216-16/+18
|\| | | | | | | Change-Id: Idb1895dae2870dbed860ba3106fe52b01d733504
| * Fix QQuickControlPrivate::getContentItem() overridesJ-P Nurmi2017-07-144-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no content item is explicitly assigned, container type of controls (Page, Pane, Popup...) create a default content item on demand. Notice that the content item is created from within the contentItem() getter, so it must not emit contentItemChanged() to avoid binding loops. QQuickControl::setContentItem_helper() was introduced in 1eaebd0 to mitigate basically the same problem with QQuickScrollView, which has its own special lazy creation of a Flickable content item. Now, the problem is that the other container controls are not executing setContentItem_helper(), because they have already assigned contentItem and therefore it returns right away. Fix the issue by returning the new content item without assigning it to let setContentItem_helper() do its job. The issue was spotted while debugging QTBUG-61434. Change-Id: Id6f84748ec08bbdfd3bd934dda627e2619af7d2a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix unused parameter errors in qwidgetplatform_p.hJason Erb2017-07-141-0/+6
| | | | | | | | | | | | | | Task-number: QTBUG-61950 Change-Id: Idbc6bcc8f08dcccc50b409a055ab6c35e1f9aef8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * QQuickDrawer: fix multi-touch leaking through modal overlayJ-P Nurmi2017-07-142-4/+4
| | | | | | | | | | | | | | | | | | | | The first touch point was blocked as appropriate, but the consequent touch points were leaking through to other popups below Drawers' modal overlay. Task-number: QTBUG-61581 Change-Id: I1c3e28e3d25b7489c4a9b684107fd1b5158e1674 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickPageIndicatorPrivate: add missing overrideJ-P Nurmi2017-07-111-1/+1
| | | | | | | | | | | | | | | | | | Somehow this passed the 5.9 CI, but the dev branch throws an error: qquickpageindicator.cpp:110:10: error: 'itemChildAdded' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override] Change-Id: I2effeb908552fa2759057cf0953ea65737be3f9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: get rid of openSubMenu()J-P Nurmi2017-07-142-19/+16
| | | | | | | | | | Change-Id: I8125971dd91614984379e734af21f5ff28852667 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make QQuickMenu::popup() available in C++J-P Nurmi2017-07-132-24/+41
| | | | | | | | | | | | | | | | | | This is going to be used for sub-menus by QQuickMenu itself, by the upcoming QQuickMenuBar, and allows users to implement their own Menu navigation if desired. Change-Id: I29258e78fec27e8dd207ed649958df1a718bcd39 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: close non-cascading parent menu from prepareEnterTransition()J-P Nurmi2017-07-131-4/+3
| | | | | | | | | | Change-Id: I075241c07702d1e8bbc89c43cef35525d9e67cc7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMenu: resolve the parent itemJ-P Nurmi2017-07-132-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | A cascading sub-menu is parented to the menu item in its parent menu, but a non-cascading sub-menu is parented to the parent menu's parent item to be able to have the sub-menu visible while the parent menu is hidden (non-cascading menus are opened and closed one by one). Based on these conditions, resolve the parent item automatically instead of doing it by hand in openSubMenu(). Change-Id: I5dd38ee0978604cd604dabf6f40ac4fb5f3eebbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 02:13:20 +0000