aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QQuickPage: fix a typo to avoid a crashLiang Qi2018-11-091-1/+1
| | | | | | | | | when setting null to footer Fixes: QTBUG-71444 Change-Id: Id4b0a3fd7aa104357674b4e2be6206894f8878da Reviewed-by: J-P Nurmi <jpnurmi@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix Instantiator-created MenuItems disappearingMitch Curtis2018-11-021-4/+44
| | | | | | | | | | | | | | | When d5cb26bc fixed a bug in Menu, it also broke the use case of having an Instantiator create menu items. Using an Instantiator like this allows users to create a "Recent Files" menu, for example. The issue was that we would indiscriminately recreate items, even those owned by an Instantiator. This patch avoids recreating items owned by Instantiators. It also adds a logging category for Menu, to aid debugging. Fixes: QTBUG-71066 Change-Id: Ie0e46de1cbfaee81b43d63f3143435f2514371d5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-02435-1314/+1333
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-2912-83/+95
| | | | | | | | | | The name of the documentation module is also changed from 'qtquickcontrols2' to 'qtquickcontrols', and this is reflected in other modules' dependencies and licensing source files (qt_attribution.json). Task-number: QTBUG-70333 Change-Id: I2ba308b7eddae3af00dfb49a751cac8527c46bba Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix custom property page for snapeModeThomas Hartmann2018-10-231-1/+1
| | | | | | Change-Id: I013643381229a43b5d8c5c114a9d86156e5e2bd7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3Liang Qi2018-10-156-13/+60
|\ | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickmenubar.cpp src/quicktemplates2/qquickmenubar_p.h src/quicktemplates2/qquickmenubar_p_p.h Change-Id: I5c2115f05826f68f1b1f5ce6762273cd91e6997e
| * 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>
* | QQuickStackView: Fix deprecated function call warningv5.12.0-alpha1Friedemann Kleint2018-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QV4::Object::getIndexed(uint) is deprecated in favor of get(uint). On this occasion, fix signedness warnings by changing j and len to be of type uint. Fixes: qquickstackview_p.cpp:103:66: warning: ‘QV4::ReturnedValue QV4::Object::getIndexed(uint, bool*) const’ is deprecated [-Wdeprecated-declarations] QV4::ScopedValue value(scope, array->getIndexed(j)); QT_DEPRECATED inline ReturnedValue getIndexed(uint idx, bool *hasProperty = nullptr) const qquickstackview_p.cpp:107:78: warning: ‘QV4::ReturnedValue QV4::Object::getIndexed(uint, bool*) const’ is deprecated [-Wdeprecated-declarations] QV4::ScopedValue props(scope, array->getIndexed(j + 1)); QT_DEPRECATED inline ReturnedValue getIndexed(uint idx, bool *hasProperty = nullptr) const Change-Id: I6c0b0d54dd4119a2531f847788c531daf92e6954 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-113-21/+49
|\| | | | | | | Change-Id: I3fa0011d8b69db2a004feb177a7f89ccb75a724d
| * 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>
* | Fix enum warningsMitch Curtis2018-08-233-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformDialogHelper's meta-object is added to QQuickDialogButtonBox's meta-object as a related meta object, and all of its enums are merged into the same namespace by the QML engine. This produces a conflict with the enum values of the ButtonLayout in QQuickDialogButtonBox, which is a duplicate of the one that's already pulled in. Fixes: QTBUG-70141 Task-number: QTBUG-70141 Change-Id: Ib33dc8ddbe8aa80d03183eb23861658c9e978f04 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQuickContainer: call getContentItem() instead of using memberMitch Curtis2018-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | This ensures that the contentItem is created (lazily) in cases like SplitView, which creates an empty QQuickContentItem. If we don't do this, items added to SplitView don't show up because it has no contentItem. Change-Id: Ide3ce45a2173cc13ee7b194ad6dc501287d6fc6c Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-182-2/+2
|\| | | | | | | Change-Id: I828b8ea2fef35e4e7ab0bb594e683f8643c793a1
| * 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>
* | qquickplatformmessagedialog: fix build errorMitch Curtis2018-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | Not sure why it's considered ambiguous, but since it's an unknown value, it's fine to print it as an int. Task-number: QTBUG-69916 Change-Id: I50335bd140626aa220e0468aef0fd1b3b34e3042 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-081-1/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I483081703594a8398d51a23c6d2266ac0ae9dfb0
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-281-0/+20
|\| | | | | | | Change-Id: Icd5d8a4292be3a335000a7bd0f30384ad83ff36d
| * 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 build with '-no-feature-action' configurationValentin Fokin2018-07-241-0/+2
| | | | | | | | | | Change-Id: I6a1488ef128f64184dccdd28aa12ff83f9975154 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-1710-8/+212
|\| | | | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickstyle.cpp src/quicktemplates2/qquickscrollview.cpp tests/auto/qquickstyle/tst_qquickstyle.cpp Change-Id: I9afddf07a956f43cf0445e91b8d1a02f167b6bd5
| * 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>
* | Material: qualify DialogButtonBox enums with "T"Mitch Curtis2018-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise strange things happen to innocent pieces of code: DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole qrc:/qml/main.qml:391:17: Unable to assign [undefined] to int Task-number: QTBUG-69286 Change-Id: I6a3c5810c06e0de38af9e87088f08b3e8bae0459 Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-037-11/+15
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Menu.qml src/imports/controls/fusion/Menu.qml src/imports/controls/imagine/Menu.qml src/imports/controls/material/Menu.qml src/imports/controls/universal/Menu.qml Change-Id: I017949e5ac617c1cdeece71204e5aa519776fb39
| * 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>
* | Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Liang Qi2018-06-2516-70/+174
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-2516-70/+174
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/imagine/TextArea.qml src/imports/controls/imagine/TextField.qml tests/auto/controls/data/tst_tumbler.qml Change-Id: I25a8228a4299fb7a53db70b7223663a1637ed933
| | * 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>
* | | QQuickStyle::addStylePath(): fix support for qrc pathsMitch Curtis2018-06-251-0/+2
|/ / | | | | | | | | | | | | | | The code lacked handling for the "qrc" scheme. Task-number: QTBUG-68222 Change-Id: Ia0dfdb748b8bdb40c893375b9de77bd8c05986b6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-3/+9
|\| | | | | | | Change-Id: Ifb36ff81047293902c9f9291f724d8e15bca7f3d
| * 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>
* | QQuickControl: only set hasBackgroundWidth/Height when necessaryMitch Curtis2018-06-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following binding in the Fusion style's TabButton.qml implementation causes the last tab's background not to cover its full width: height: control.height - (control.checked ? 0 : 2) It seems that this line is executed upon the completion of deferred execution of the background, which somehow results in the early return check in itemGeometryChanged() not being executed. After that, there are these two lines: extra.value().hasBackgroundWidth = p->widthValid; extra.value().hasBackgroundHeight = p->heightValid; Even though this was just a change in height, hasBackgroundWidth was set to true early on (when the width was 8; the combined left and right padding), preventing the control from setting a width on the background in the future. This patch fixes the issue by only setting hasBackgroundWidth if the width was changed, and only setting hasBackgroundHeight if the height was changed. Task-number: QTBUG-68556 Change-Id: I4c7dbc60d8e73c60c025e5d6c65f3917e6e4ea08 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-26117-0/+0
|\| | | | | | | Change-Id: Ieff89a2abd82cd12b6d80bcc487e3872b9f63bf6
| * 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>
* | Doc: fix SystemTrayIcon::icon.maskJ-P Nurmi2018-05-241-1/+1
| | | | | | | | | | Change-Id: Ifcfd6f57528784b192eeeb39b3d3672459a0327c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 20:40:48 +0000