aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Doc: Update \titles with "Controls 2" in itVenugopal Shivashankar2018-12-0415-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | Alternatively, the old \title is now a \keyword, to avoid broken links to the page. Change-Id: Ib8b97efe8be13559c45c7ca430b2afc93edaa3e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix for SpinBox crash in Qt Quick DesignerThomas Hartmann2018-12-044-2/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash was not 100% reliable and depends on the order in the hash(). Something in beginDeferred() has a side effect on deferData->bindings and an element gets deleted. This causes a crash while iterating (++it). Therefore we do a copy of the hash. I added a regression test. The test did only crash for SpinBox and it did only crash roughly half the time. Task-number: QTBUG-71942 Change-Id: I339e0a4382f97db44f6ff2e9f07f2be7278d1e24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Port QQuickComboBox to QRegularExpressionSamuel Gaist2018-12-041-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | This patch updates the QQuickComboBox code to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: I6551fac80b071073e3cd09d2016ef99df510e8ff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix QQuickIconLabel's baselineOffsetMitch Curtis2018-12-032-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Set it to the bottom of the text if there is text. Change-Id: I03e14ec587e0868e1f2104dd464591b243ea9264 Fixes: QTBUG-71554 Reviewed-by: Pierre-Yves Siret <gr3cko@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Doc: clarify event handlingMitch Curtis2018-12-032-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current documentation says: "All controls, except non-interactive indicators, do not let clicks and touches through to items below them. For example, if Pane is used as the header or footer of ApplicationWindow, items underneath it will not get mouse or touch events." This can be confusing, because a Pane declared as a child of a MouseArea is "below" the MouseArea in code, but is "above" the MouseArea in the scene. Add a code example to make it less ambiguous. Also, link to the Event Handling section from Pane's docs. Task-number: QTBUG-71735 Change-Id: I97f4d6501af410bd5d5c0c0e48b14ca65605357d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Fix compilation with gcc 4.8Ville Voutilainen2018-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | GCC 4.8 doesn't like using QPointer in signal connections. Change-Id: Idc61984b155b0af8d1afb9d43c9eaf44ca9073cd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Doc: add "1" to all mentions of the old Qt Quick ControlsMitch Curtis2018-12-032-9/+9
| | | | | | | | | | | | | | | | | | | | | Be explicit and reduce the chance for confusion. Change-Id: I4bd912660ee32705cd9c7bdc667ccb4e255a302b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | qquickfusionstyle: do not force a fixed blue color as highlight colorTimur Pocheptsov2018-11-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | use the one from ... mac system palette. Task-number: QTBUG-70652 Change-Id: I0aa9ab0596ceb8222327d9febbb132fffc3968cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: Add qmake include flag for modulePaul Wicking2018-11-271-0/+2
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-63834 Change-Id: I8ba52d68a878ec61337e8111d233409a9a98f47d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | QQuickScrollView: override getContentWidth/Height()Richard Moe Gustavsen2018-11-272-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A ScrollView lets you add the Flickable that should be decorated as a child. If that flickable has one (and only one) child, the contentWidth/Height properties of the ScrollView will be calculated by using the implicit size of that child (unless you assign something else to those properties explicitly). This logic goes wrong when the flickable is a TableView for several reasons. The first is that TableView will populate the content item dynamically, and for the first delegate item added, the content size of the ScrollView will be set to be the size of this item (since the TableView only got one child at that point). The second is that TableView has its own set of contentWidth/Height properties. And those properties are not respected by ScrollView. So even if TableView set the contentWidth/Height to be the size of the table, this will not be used by ScrollView. The result is that ScrollView concludes that the content item is empty, which means that no scrollbars end up visible or usable. This patch will fix this by overriding getContentWidth()/Height() from QQuickPane. The implementation will check if the flickable has valid contentWidth/Height values set, and if so, use them. Otherwise it will fall back to the old QQuickPane implementation (which will inspect the children etc). Fixes: QTBUG-71974 Change-Id: I027b9b939a10df2aeb816dea596adcb452f914b9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Fix compilation with qreal=floatFriedemann Kleint2018-11-263-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Introduce casts where required. Fixes: QTBUG-71952 Change-Id: I63a99d6918bc00367439e967e3c45a733b41c482 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Stop using wildcards with "direct" RESOURCES syntax in examplesMitch Curtis2018-10-314-10/+73
|/ / | | | | | | | | | | | | | | | | | | | | Build tools cannot detect when new files are added with this syntax. As we don't use wildcards with SOURCES, we also shouldn't use them with RESOURCES either. Change-Id: Ic42ee9d892a4f18a1a21bd757d7398a50792a6c7 Fixes: QTBUG-71321 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-2922-84/+106
| | | | | | | | | | | | | | | | | | | | 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>
* | tst_QQuickApplicationWindow: remove workaroundMitch Curtis2018-10-261-5/+0
| | | | | | | | | | | | | | | | | | | | 30fcc735 introduced this to work around a crash that was apparently caused by 4c71db75. The commit that added the workaround is now three years old, and removing it fixes a crash that is blocking CI. Change-Id: Iefbb32e00d57e5ad86c43977e10120fdc92a3635 Fixes: QTBUG-70064 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Fix heap-use-after-free in tst_QQuickDrawerMitch Curtis2018-10-261-1/+5
| | | | | | | | | | | | | | | | | | Ensure the QByteArray we set as the current test name outlives the test. Task-number: QTBUG-71387 Change-Id: Id5f75b5ffcd1a710b5d8be4796cf48ee8dd1896d Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | Skip tst_font::font() on macOS 10.12Mitch Curtis2018-10-221-0/+5
| | | | | | | | | | | | | | | | | | It crashes, but I'm unable to debug it with a CI VM because it won't build. Task-number: QTBUG-70063 Change-Id: Ia9c32a145c40cc55ab56dcf3fd52468d7a925f40 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3Liang Qi2018-10-158-13/+166
|\| | | | | | | | | | | | | | | | | 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-026-12/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Stabilize tst_qquickmenubarMitch Curtis2018-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | Something about postponing delegate creation to component completion means that the fileMenuBarItem->isHighlighted() check fails occasionally. Give it a chance to sort itself out before sending move events. Change-Id: I140ec835b5cb4ec7d784215a20567469ad422c5b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | tst_qquickmenu: fix memory leakv5.12.0-beta2Mitch Curtis2018-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | takeItem() unparents the item, so we need to make sure it gets deleted. The leak was caught by valgrind: ==10039== 832 (32 direct, 800 indirect) bytes in 1 blocks are definitely lost in loss record 6,465 of 6,706 ==10039== at 0x4C3017F: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==10039== by 0x112C1E: tst_QQuickMenu::count() (tst_qquickmenu.cpp:121) ==10039== by 0x12F313: tst_QQuickMenu::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (tst_qquickmenu.moc:156) ==10039== by 0x612B6B2: QMetaMethod::invoke(QObject*, Qt::ConnectionType, QGenericReturnArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument) const (qmetaobject.cpp:2305) ==10039== by 0x41B07CD: invoke (qmetaobject.h:123) ==10039== by 0x41B07CD: QTest::TestMethods::invokeTestOnData(int) const (qtestcase.cpp:915) ==10039== by 0x41B15BF: QTest::TestMethods::invokeTest(int, char const*, QTest::WatchDog*) const (qtestcase.cpp:1114) ==10039== by 0x41B1D07: QTest::TestMethods::invokeTests(QObject*) const (qtestcase.cpp:1456) ==10039== by 0x41B2381: QTest::qRun() (qtestcase.cpp:1896) ==10039== by 0x41B24E1: QTest::qExec(QObject*, int, char**) (qtestcase.cpp:1783) ==10039== by 0x12F468: main (tst_qquickmenu.cpp:1505) Change-Id: I459c7897c1088c8b58152d2e0b5ceb8f3684e589 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | wearable: add demo modev5.12.0-beta1Mitch Curtis2018-09-2720-24/+507
| | | | | | | | | | | | | | | | | | | | | | This change adds a switch in the settings page that enables demo mode. In this mode, each screen and UI control will be visited and interacted with in a loop until the screen is tapped, at which point it returns to the launcher page. Change-Id: Icb306e23985d8c1f82725a95ed7f2e34b3d6c03f Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | wearable: add a dark theme with a runtime switch on the Settings pageMitch Curtis2018-09-2799-105/+291
| | | | | | | | | | Change-Id: Iaa205c19aa413de7a5537f17f74d969547d5e558 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | wearable: bump import versions to 5.10Mitch Curtis2018-09-2717-33/+33
| | | | | | | | | | | | | | | | Some API we need is only available in later versions. Don't go past 5.10 for now, because the support isn't there yet. Change-Id: I6915d34ef37b47b9b07e6e4aa85c90ff2e8b59b2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Skip tst_font::systemFont()Mitch Curtis2018-09-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | The qmlClearTypeRegistrations() call causes a crash and it's not clear why. Until we can fix it, skip it so that other changes can get in. It should be skipped rather than blacklisted as it shouldn't be run at all. Task-number: QTBUG-70063 Change-Id: I1ff47e034f121014370bbf9d65e8ac68769a8d31 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-181-0/+3
|\| | | | | | | Change-Id: Ic5311418d3f25398380c4a32b35753329efb6f3f
| * Attempt to stabilise Popup::test_shortcut auto testMitch Curtis2018-09-121-0/+3
| | | | | | | | | | | | | | | | | | Ensure that the window is active before trying to activate keyboard shortcuts. Task-number: QTBUG-70413 Change-Id: Ibac1526efd9c53f1f2aa3401da3855ce26d35d6a Reviewed-by: Liang Qi <liang.qi@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>
* | Extend opensuse blacklisting to opensuse-leapTony Sarajärvi2018-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | In openSUSE 15.0 /etc/os-release the ID of the OS was changed from "opensuse" to "opensuse-leap". So every blacklisting we did for opensuse, didn't cover opensuse-leap. This one adds opensuse-leap as a blacklisted platform whenever opensuse was blacklisted. Task-number: QTBUG-70413 Change-Id: Ib84cda329160d4cfed28cb168f380269c24f8435 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-1118-31/+436
|\| | | | | | | Change-Id: I3fa0011d8b69db2a004feb177a7f89ccb75a724d
| * wearable: fix items still being visible when returning to LauncherPageMitch Curtis2018-09-107-10/+77
| | | | | | | | | | | | | | Hide SwipeView items when appropriate, as it's not done automatically. Change-Id: Ic716da004794b7d0eba65c220f6242d4113302d9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+32
| |\ | | | | | | | | | Change-Id: Ifd12565444714cf68e21ff7f9c37cb5bb368b63d
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-09-031-0/+32
| | | | | | | | | | | | | | | Change-Id: Ic365389ccf0571fd29c299dbfe3b2269e8818f7d Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
| * | Menu: ensure the correct delegates are used when created via ComponentMitch Curtis2018-09-059-17/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 blacklist syntax of Popup::test_shortcutTony Sarajärvi2018-09-071-1/+1
| | | | | | | | | | | | Task-number: QTBUG-70413 Change-Id: Ie4ae23a7869bb0cbb41f452637ccf55c58b24182 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Blacklist flaky Popup::test_shortcut on openSUSETony Sarajärvi2018-09-061-0/+2
| | | | | | | | | | | | Task-number: QTBUG-70413 Change-Id: I86b6d4924b6042b9d934bf3f15901eb9a8a6c7f5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | 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>
* | Fix tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar() failureMitch Curtis2018-08-202-3/+3
| | | | | | | | | | | | | | | | | | Move DummyStyle into a subdirectory of the "data" directory, because otherwise availableStyles() picks it up and makes us fail. Task-number: QTBUG-70065 Change-Id: Ib69075832b5bcf30c6b960e6a4bcda69f016baf2 Reviewed-by: Liang Qi <liang.qi@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-0815-2/+101
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I483081703594a8398d51a23c6d2266ac0ae9dfb0
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I29a3e01b919b23df1e9dca9f3c2cb4941db79829
| * gallery: strip png metadata to avoid warningMitch Curtis2018-07-3012-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The warning was: "libpng warning: iCCP: known incorrect sRGB profile" The metadata was removed with this command: optipng -o7 -strip all *.png Change-Id: Icc8f365becb25f8267f93383de9ec78c18f6a03e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * QQuickIconImage: prevent color from being applied twiceMitch Curtis2018-07-303-2/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 08:45:36 +0000