aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QQuickPopupPositioner: avoid adding duplicate item change listenersMitch Curtis2018-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The issue is that QQuickPopupPositioner::setParentItem() is called when the delegate has been created and assigned to the Repeater, then the ancestor listeners are added, and then straight after that, the benchmark item itself is parented to benchmarkRoot, which causes QQuickPopupPositioner::itemParentChanged() to be called, which adds a single ancestor listener: the QQuickRootItem (which was just added previously as a result of QQuickPopupPositioner::setParentItem() being called). The item could be arbitrarily high up in the ancestry tree, so there's no nice (i.e. fast) way of checking for duplicates in Controls 2 itself. Instead, use the new QQuickItemPrivate::updateOrAddItemChangeListener() function which only adds the listener if it doesn't already exist. This avoids a heap-use-after-free in qmlbench when creating Menus. Task-number: QTBUG-70729 Change-Id: I0efaa10167c4c9a9c4c1b65a5c34e683c3ec5732 Fixes: QTBUG-70729 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* MenuBar: ensure the correct delegates are used when created via ComponentMitch Curtis2018-10-024-12/+52
| | | | | | | | | | | | | Don't add items until we're complete, as the delegate could change in the meantime. Instead, add them to contentData and create them when we're complete. A similar fix was already done for Menu in d5cb26bc. Task-number: QTBUG-67559 Change-Id: Idb43b7a69fcf1c1ad6396c73a3c090b92e460ab8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Menu: ensure the correct delegates are used when created via ComponentMitch Curtis2018-09-052-17/+45
| | | | | | | | | | Don't add items until we're complete, as the delegate could change in the meantime. Instead, add them to contentData and create them when we're complete. Task-number: QTBUG-67559 Change-Id: I5f42129f49de861ff5f15d0069daeda0b4e5017c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Doc: improve SwipeView docsMitch Curtis2018-09-031-4/+4
| | | | | Change-Id: Ic1cc85ed76c3ee534b7dda43449140a791cff36d Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* QQuickStackView: fix crash on viewItemTransitionFinished()Alexandr Akulich2018-08-111-1/+1
| | | | | | | | | | Check transitioner for nullptr before access. The transitioner created only on some transition setter called and remain nullptr on base unstyled StackView from templates. Task-number: QTBUG-69897 Change-Id: I51564c5e7195112764f5a63b3b48c302a6d29146 Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* QQuickPlatformColorDialog - properly initialize platform dialog helperTimur Pocheptsov2018-08-091-1/+1
| | | | | | | | | | QCocoaColorDialogHelper in its setCurrentColor does some initialization (using NSColorPanel) and required its 'm_options' to be set by this point. So, first set options, then current color. Task-number: QTBUG-69839 Change-Id: I9092c80a511890e958de5b99a9614feb134dba7e Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* QQuickIconImage: prevent color from being applied twiceMitch Curtis2018-07-301-1/+2
| | | | | | | | | | | | | | | | | | | | | QQuickIconImage::componentComplete() calls QQuickIconImagePrivate::updateIcon(), which loads the icon's image via QQuickImageBase::load(). That eventually calls QQuickImageBase::requestFinished(), which calls QQuickIconImage::pixmapChange(). That then calls QQuickIconImagePrivate::updateFillMode(), which can in turn cause QQuickIconImage::pixmapChange() to be called again, causing recursion. This recursion resulted in icon.color being applied twice. We already have a recursion check in place in QQuickIconImagePrivate::updateFillMode(), so we can reuse that in QQuickIconImage::pixmapChange() to know whether or not we should apply the color to the image. Task-number: QTBUG-69506 Change-Id: I5cd9edaa524c7ceb9c41c53a9efefcc4c647e246 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: add a note about the best way to set paddingMitch Curtis2018-07-241-0/+20
| | | | | | | | | | | As the styles are subject to change over time, it's best to use the most fine-grained properties for specifying padding (topPadding, bottomPadding, etc.). Using these specific properties will ensure that what the user specifies always wins over what the style specifies. Task-number: QTBUG-69551 Change-Id: I4163e9918010fad0cb6ec701b49dbc59b086cf47 Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* Fix crash on exit when using a shader and a PopupSimon Hausmann2018-07-161-1/+1
| | | | | | | | | 3b5143bb67cdaaff6b0eabedff1034e4add7ec87 already fixed a crash with the same stack trace in dev. The same fix works with the referenced bug report. Task-number: QTBUG-66483 Change-Id: I05450d2ff40f317d9b5b59e28991fa92b414022e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix qrc paths in QT_QUICK_CONTROLS_STYLE_PATHMitch Curtis2018-07-161-2/+60
| | | | | | | | | Parse the environment variable manually when the platform's list separator is ':', to avoid issues with qrc paths (which start with ':') not working. Task-number: QTBUG-68219 Change-Id: Ic71d49da5a72a37bc1d2e7b19fbf1de71b3917f3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: add "Sizing" section to ScrollView's docsMitch Curtis2018-07-111-2/+16
| | | | | | | | Mention some important details about contentWidth and contentHeight. Task-number: QTBUG-69376 Change-Id: Iea6c6e36bb11436d30a0284a666c60ab7716f31b Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* Doc: Add AbstractButton.TextUnderIcon to display:enumeration listPaul Wicking2018-07-112-0/+1
| | | | | | Task-number: QTBUG-68298 Change-Id: I049ff1de079f065182429f43a20e1a3899f4a962 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: provide code snippets for Overlay.modal and Overlay.modelessMitch Curtis2018-07-103-0/+120
| | | | | Change-Id: I0ea789c0ba3a153b00ac3ab6501ecf10f6c733ce Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: Re-add .qml files as example sourcesTopi Reinio2018-07-041-1/+1
| | | | | | | | | | | | | | | Commit dabf5d2e fixed a documentation issue with QML type inheritance by excluding .qml files from the documentation build. A side-effect is that example documentation pages do not list .qml files as part of the example project. Instead of excluding all .qml files, simply exclude '*.qml' from the list of source file extensions. This way, .qml files are still considered to be part of examples. Task-number: QTBUG-69141 Change-Id: I51a6d1768c30cfb9025a1aaf718b93bfae52437a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Move all pendingCurrentIndex assignments to a private setterMitch Curtis2018-07-032-7/+13
| | | | | | | | | This makes debugging significantly easier, in that it's now possible to use one qDebug() statement for the assignment rather than a handful at different places in the code. Change-Id: Ic6fdc2943b6eeb0496148b07d7a3ece0b6399c1b Reviewed-by: Liang Qi <liang.qi@qt.io>
* Doc: Exclude .qml source files from the documentation buildTopi Reinio2018-06-271-0/+4
| | | | | | | | | | | | | | | | There are multiple copies (for each style) of .qml files, all without documentation. The types are documented in .cpp or .qdoc files, but QDoc parsed also the .qml source and generated (internal) nodes for these undocumented types - this conflicted with the actual documented types, causing the inheritance information to go missing. To solve this, exclude all .qml files from the build as they contain no documentation. Task-number: QTBUG-69141 Change-Id: If9a84d91f37d5f9431c9ce1d0d079b7fd5159445 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Menu: fix items not being scrollable when using WindowMitch Curtis2018-06-255-10/+10
| | | | | | | | | | Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QQuickTumblerAttachedPrivate: fix type of variable: int => qrealMitch Curtis2018-06-251-1/+1
| | | | | | | Not sure why this was ever an integer... Change-Id: Ibfa2a547741328a7492c0da1c5cc87d5f6f885e1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QQuickSpinBox: Fix "function expressions as statements" warningMitch Curtis2018-06-211-1/+1
| | | | | | | | | | | Surround the function with parentheses as suggested: QWARN : tst_Snippets::verify(qtquickcontrols2-spinbox-custom) Warning: Using function expressions as statements in scripts is not compliant with the ECMAScript specification: "function(value, locale) { return Number(value).toLocaleString(locale, ..." This will throw a syntax error in Qt 5.12. If you want a function expression, surround it by parentheses. Change-Id: I39df9af9b3dc62ffaf6fcba071c04c8933698c07 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Imagine: document how to export 9-patch imagesMitch Curtis2018-06-141-0/+54
| | | | | | Task-number: QTBUG-66834 Change-Id: I8a07e114d230361f21dfbf1458210729b3607d92 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Fix Tumbler not respecting currentIndex changes in onModelChangedMitch Curtis2018-06-133-68/+100
| | | | | | | | | | | | | | | | | | | | | | | | | The use case in the referenced bug report looks something like this: Tumbler { model: 4 // ... onModelChanged: { currentIndex = model - 2; } } The problem was that setting currentIndex in onModelChanged would cause the wrap to change to true, which in turn caused the internal view to change to PathView. This would cause the currentIndex to be set to 0 on successive model changes (i.e ++model). By keeping track of whether or not the user set the currentIndex during a model change, we can ignore changes in the internal view's currentIndex and restore the user's currentIndex afterwards. Task-number: QTBUG-68737 Change-Id: I25738f36cf58a331d1b8e50b5029b4aa1dd27db5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Document which modules are required when building from sourceMitch Curtis2018-06-131-0/+9
| | | | | | | | | | | There is currently no indication (in the form of build output) that the user is missing a required module when building from source. QTBUG-68826 suggests that such a feature be added, but until then, we need a way to inform users how to build from source. Task-number: QTBUG-68618 Change-Id: Ic17565aeaaff6aaa9907552d3b0c2646b407b425 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* TextArea, TextField: use the control's renderType in placeholder textMitch Curtis2018-06-1310-1/+10
| | | | | | | | | | | | The placeholder text's renderType should cohere to the renderType of the control. This is already the case for font, and sometimes color too. This solution avoids the need to expose a new property. Task-number: QTBUG-68769 Change-Id: I6711aea83b7b8ee27f56b9c905aa4870465e3fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Imagine: clarify 9-patch line documentationMitch Curtis2018-06-081-3/+9
| | | | | | | | | Explain that the 9-patch lines must be one pixel thick regardless of the intended DPI (e.g. @2x) of the image. Task-number: QTBUG-66834 Change-Id: I57ab0460bf190a67a436dd63543ea0e09812a898 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update icons for Qt Quick DesignerThomas Hartmann2018-05-24117-0/+0
| | | | | | | | | | We do not provide a 2x version for the 16x16 icon, since the difference is quite subtle and it reduces the maintenance burden. We do not provide those for the other icon sets, too. Change-Id: Ia6914c1abe8bac94ace9659a8b2c46cf3ed5fb56 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Styles: use C++11 default member initializationJ-P Nurmi2018-05-0426-131/+95
| | | | | Change-Id: Ifd7521b8a7bfd7da91808dd00ebdcb59f2ba46dc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Controls: use C++11 default member initializationJ-P Nurmi2018-05-0417-95/+50
| | | | | Change-Id: Ief81868a8d314f7e7722fc0cb6670ae0dc4da50f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Templates: use C++11 default member initializationJ-P Nurmi2018-05-0483-1065/+406
| | | | | | | | | | | The code is more readable and less error-prone (this patch caught a few uninitialized members) when the members are initialized in the same place where they are declared. In many cases, empty default destructors can be entirely removed, and we get faster implicitly declared inline default constructors defined by the compiler. Change-Id: I14c5448afc901f9b2ac5965f28c1c26c0b646c08 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix QQuickPopupPositionerJ-P Nurmi2018-05-042-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a double-regression caused by commits bcd1bed and 03a8c88. Both of these changes caused dangling pointers being left on the list of item change listeners. First, bcd1bed made QQuickPopupPositioner use QQuickItem::isAncestorOf() without noticing the difference that the old self-made isAncestorOf() conveniently returned true for the item itself, whereas the new built-in QQuickItem::isAncestorOf() doesn't. This had a nasty side effect that when the popup's parent item was removed from its parent, QQuickPopupPositioner::itemChildRemoved() no longer removed the ancestor listeners. Then, 03a8c88 made things worse by changing the stack allocation of QQuickPopupPositioner to heap allocation without ever deleting the positioner object. Valgrind output for tst_tooltip: ==14391== Invalid read of size 8 ==14391== at 0x79EFB9A: QQuickItemPrivate::itemChange(QQuickItem::ItemChange, QQuickItem::ItemChangeData const&) (qquickitem.cpp:6206) ==14391== by 0x79F3D98: QQuickItem::setParentItem(QQuickItem*) (qquickitem.cpp:2791) ==14391== by 0x79F3E87: QQuickItem::~QQuickItem() (qquickitem.cpp:2385) ==14391== by 0x7A16073: ~QQmlElement (qqmlprivate.h:103) ==14391== by 0x7A16073: QQmlPrivate::QQmlElement<QQuickItem>::~QQmlElement() (qqmlprivate.h:103) ==14391== by 0x7A9CFEE: QQuickView::~QQuickView() (qquickview.cpp:218) ==14391== by 0x4038215: quick_test_main_with_setup(int, char**, char const*, char const*, QObject*) (quicktest.cpp:512) ==14391== by 0x4038CFF: quick_test_main(int, char**, char const*, char const*) (quicktest.cpp:330) ==14391== by 0x400BD7: main (tst_default.cpp:44) ==14391== Address 0x1f2d3f10 is 0 bytes inside a block of size 32 free'd ==14391== at 0x4C2F29C: operator delete(void*) (vg_replace_malloc.c:576) ==14391== by 0x29CA2641: QQuickPopupPositioner::~QQuickPopupPositioner() (qquickpopuppositioner.cpp:68) ==14391== by 0x29CA004C: QQuickPopup::~QQuickPopup() (qquickpopup.cpp:783) ==14391== by 0x2A1A4CEE: ~QQuickToolTip (qquicktooltip_p.h:59) ==14391== by 0x2A1A4CEE: ~QQmlElement (qqmlprivate.h:103) ==14391== by 0x2A1A4CEE: QQmlPrivate::QQmlElement<QQuickToolTip>::~QQmlElement() (qqmlprivate.h:103) ==14391== by 0x6397A65: QObjectPrivate::deleteChildren() (qobject.cpp:1997) ==14391== by 0x6398DDA: QObject::~QObject() (qobject.cpp:1025) ==14391== by 0x79F41FA: QQuickItem::~QQuickItem() (qquickitem.cpp:2378) ==14391== by 0x7A897D5: QQuickMouseArea::~QQuickMouseArea() (qquickmousearea.cpp:452) ==14391== by 0x7A1699D: ~QQmlElement (qqmlprivate.h:103) ==14391== by 0x7A1699D: QQmlPrivate::QQmlElement<QQuickMouseArea>::~QQmlElement() (qqmlprivate.h:103) ==14391== by 0x639082D: qDeleteInEventHandler(QObject*) (qobject.cpp:4603) ==14391== by 0x6392478: QObject::event(QEvent*) (qobject.cpp:1242) ==14391== by 0x79F1D77: QQuickItem::event(QEvent*) (qquickitem.cpp:8006) ==14391== Block was alloc'd at ==14391== at 0x4C2E226: operator new(unsigned long) (vg_replace_malloc.c:334) ==14391== by 0x29C9F939: QQuickPopupPrivate::init() (qquickpopup.cpp:280) ==14391== by 0x29C9FD4E: QQuickPopup::QQuickPopup(QQuickPopupPrivate&, QObject*) (qquickpopup.cpp:771) ==14391== by 0x29CC6CBB: QQuickToolTip::QQuickToolTip(QQuickItem*) (qquicktooltip.cpp:171) ==14391== by 0x2A1A58DD: QQmlElement (qqmlprivate.h:98) ==14391== by 0x2A1A58DD: void QQmlPrivate::createInto<QQuickToolTip>(void*) (qqmlprivate.h:107) ==14391== by 0x5D0186D: QQmlType::create(QObject**, void**, unsigned long) const (qqmlmetatype.cpp:915) ==14391== by 0x5D81EFF: QQmlObjectCreator::createInstance(int, QObject*, bool) (qqmlobjectcreator.cpp:1163) ==14391== by 0x5D85AE2: QQmlObjectCreator::create(int, QObject*, QQmlInstantiationInterrupt*) (qqmlobjectcreator.cpp:203) ==14391== by 0x5D82230: QQmlObjectCreator::createInstance(int, QObject*, bool) (qqmlobjectcreator.cpp:1202) ==14391== by 0x5D82F65: QQmlObjectCreator::setPropertyBinding(QQmlPropertyData const*, QV4::CompiledData::Binding const*) (qqmlobjectcreator.cpp:825) ==14391== by 0x5D85105: QQmlObjectCreator::setupBindings(bool) (qqmlobjectcreator.cpp:777) ==14391== by 0x5D857C5: QQmlObjectCreator::populateInstance(int, QObject*, QObject*, QQmlPropertyData const*) (qqmlobjectcreator.cpp:1456) Change-Id: Id368e79146f4673708a84253a009fcdf24ab4a2c Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Document the default value of ComboBox's currentIndex propertyMitch Curtis2018-05-021-0/+2
| | | | | Change-Id: I60dbf84127c800a5f0590ae46c4be3ece7ca3141 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* ComboBox: don't block the escape/back key (with fixed test)J-P Nurmi2018-04-251-3/+5
| | | | | | | | | | | | | | Accept Key_Escape or Key_Back only if it actually close the popup. If the popup is not visible, the key is not handled, and the event should therefore propagate (and potentially close the app on Android). Note: def92f7 had a broken test (didn't take the popup exit transition into account) and thus, blocked the CI and got rejected in 110b718. Task-number: QTBUG-67684 Change-Id: I46b4731b3006721f3737cf909fbd97331ac6d8ed Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Revert "ComboBox: don't block the escape/back key"Liang Qi2018-04-251-5/+3
| | | | | | | | | | This change got integrated by sick COIN. This reverts commit def92f7b657ee9247beffffcb0cadd1eca8be3c6. Task-number: QTBUG-67930 Change-Id: I541579d7112ba386b227b7892d4e0aa8e2bd4edf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* ComboBox: don't block the escape/back keyJ-P Nurmi2018-04-231-3/+5
| | | | | | | | | | Accept Key_Escape or Key_Back only if it actually close the popup. If the popup is not visible, the key is not handled, and the event should therefore propagate (and potentially close the app on Android). Change-Id: Ibdb0cab8e0ac47005c5112f7ca4882288f1f5a17 Task-number: QTBUG-67684 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* ComboBox: reset when hiddenJ-P Nurmi2018-04-232-0/+11
| | | | | | | | Close the popup and reset the pressed state. Same as in focusOutEvent(). Task-number: QTBUG-67684 Change-Id: I51143175b0f90f3edd116723481faed6ac6e7988 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Ensure that CheckIndicator works with MenuItemMitch Curtis2018-04-202-6/+8
| | | | | | | | | | This was broken in 99b2fbbc90466c79837c7e68ac5d7a15b2f91699. MenuItem doesn't have a checkState property, so we need to check its checked property instead. Change-Id: I3c2f9b27a1fe81c1de3500fad7e7bbe17ce6e02e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Slider, RangeSlider: document stepSize's relation to snapModeMitch Curtis2018-04-192-0/+6
| | | | | | Task-number: QTBUG-67478 Change-Id: Idb2a24fe6397b8c86d94e250968bc4e175bfa554 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Slider, RangeSlider: document pressed slightly more thoroughlyMitch Curtis2018-04-182-3/+6
| | | | | Change-Id: I16d6ece7ae0e4278c7bc02a6db294863116e84c7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Page: fix implicitWidth bindingsJ-P Nurmi2018-04-175-15/+15
| | | | | | | | Don't add paddings to header and footer width when choosing the max. Padding affects content, not headers and footers. Change-Id: I92381762f97eab384b18510522bf788abecd8338 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: fix RadioIndicator disabled statev5.11.0-beta4Mitch Curtis2018-04-101-2/+2
| | | | | | Task-number: QTBUG-67574 Change-Id: I3ab706c3eb6ad3112ed3f0a7dc37d530a179be6f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Material: fix CheckIndicator disabled stateMitch Curtis2018-04-101-2/+3
| | | | | | Task-number: QTBUG-67573 Change-Id: Iecdc9f6f35f858b962dc9a9e17077a35f56e90dd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fusion: add plugins.qmltypesJ-P Nurmi2018-04-091-0/+146
| | | | | | | | | | | | | | | Even though there are no public QML types in the QtQuick.Controls.Fusion namespace, we must provide plugins.qmltypes to avoid that tooling tries to run qmlplugindump. Because of the internal .impl namespace, running qmlplugindump doesn't work out of the box. The plugins.qmltypes file has been dumped after deleting all .qml files from QT_INSTALL_QML/QtQuick/Controls.2/Fusion and then manually edited to remove all redundant QQC2 type definitions, leaving only the Fusion .impl type definitions, similarly to what we did with the other styles. Task-number: QTBUG-66276 Change-Id: I39ecfa1cd889ec5013a85dcdf96395fa31e92e57 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: give RadioIndicator a disabled stateMitch Curtis2018-04-091-1/+2
| | | | | | Task-number: QTBUG-67442 Change-Id: I41d8515763ef3af6da463ab9c1549164de3fafa0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix background size regression caused by deferred executionJ-P Nurmi2018-04-093-0/+3
| | | | | | | | Same as aca950e4 for QQuickControl. Change-Id: I508bb882cae7dd578349351d1f48919c45ca3d27 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QQuickLabel: fix background resizingJ-P Nurmi2018-04-092-11/+21
| | | | | | | | setBackground() must resize the item if component construction is already complete. Change-Id: I76cada5b37257473a9c0146ee1f6de8de6c10218 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* TextArea: fix background parentJ-P Nurmi2018-04-051-1/+4
| | | | | | | | | | | | | | QQuickTextAreaPrivate::attachFlickable() reparents the background from Flickable::contentItem to the Flickable itself. This avoids that the background scrolls together with the content. However, when deferred execution was enabled, attachFlickable() ended up being called before the background had been executed. If the TextArea has already been attached to a Flickable when the background gets exeuted, set the appropriate parent in setBackground(). Task-number: QTBUG-67334 Change-Id: I0847fca5861fdddeac7d47d47316b74bb31500cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2018-04-042-2/+2
| | | | | | Change-Id: I54225f958a16151f24a8c773489017d5b0a22d54 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Ensure that QQuickIcon is properly registeredThomas Hartmann2018-04-043-0/+19
| | | | | | | | | | | | | This is required to avoid false positives about e.g. icon.source. Note: I had issues when dumping controls. Certain types were not part of plugins.qmltypes anymore. I fixed that manually. Task-number: QTBUG-66625 Change-Id: I802b427efee5c27720c99c537ddb4690f74449fd Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Link to RangeSlider from Slider's docs, and vice versav5.11.0-beta3Mitch Curtis2018-04-042-0/+5
| | | | | | Task-number: QTBUG-67316 Change-Id: Ia10778f5e3da8f7c3480504792da228b90bb4854 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: use Math.round() in Overlay parent exampleMitch Curtis2018-04-041-2/+2
| | | | | Change-Id: Ib8c0688e071781e25ef4fdd8a51e302def32215f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix current color is not set first time in ColorDialogTasuku Suzuki2018-03-261-0/+1
| | | | | | Task-number: QT3DS-1363 Change-Id: Id464f3373bdc486060dcd1e351ffe29c55d85696 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>