aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Docs: make button icons sound as worthy as text labelsJ-P Nurmi2017-10-234-11/+10
| | | | | | | | | | | | | | | | Advertise text and icon properties equally. The additional mention of the icon property make icons sound somehow less worthy. :) Change-Id: I564954091ba9d484abda702ce4ba46ddebe7a082 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-229-32/+122
|\| | | | | | | Change-Id: I9188f94e40e2ecb4da1963ce2fcf915ab7a4b4fb
| * QQuickDialogButtonBox: fix potential crash in updateLayout()J-P Nurmi2017-10-201-2/+2
| | | | | | | | | | | | | | | | | | Don't dereference the contentItem pointer without checking. We can use availableWidth/Height as a fallback. Task-number: QTBUG-63898 Change-Id: I1ef7704e96e233036eacd6e3586f5bd0c72fac2d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Speedup tst_pageindicatorJ-P Nurmi2017-10-191-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | test_interactive() was iterating the entire rectangle 2px around each indicator pixel by pixel and sending mouse clicks and touch presses + releases at each coordinate. This resulted to a total of 845 mouse clicks and 845 touch presses and releases. Select a few interesting coordinates to reduce it down to 40 mouse clicks and touch presses and releases. Change-Id: Ie3439aae8481e019956c49d2d82067dac8741b8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-181-4/+4
| | | | | | | | | | Change-Id: Ifbbc0695023d238f2066f3412e563fb663cdec74 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * QQuickContainer: fix itemSiblingOrderChanged()J-P Nurmi2017-10-174-14/+59
| | | | | | | | | | | | | | | | | | | | | | The problem was that QQuickContainer started already moving items while QQmlObjectModel was creating items and QQuickRepeater was initializing the order. Don't reorder items during the creation, but only after component completion. Task-number: QTBUG-61310 Change-Id: I13380c5ab6b3bddaad3fa03ef6fb028622b4cd11 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickToolTip: disable hoverJ-P Nurmi2017-10-122-0/+33
| | | | | | | | | | | | | | | | | | | | Tooltips are special popups that should not block hover, because it conflicts with the typical condition for showing tooltips on desktop platforms. Task-number: QTBUG-63644 Change-Id: Ie974aed23a7df8e4b926bec5fe717cb909d15842 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | remove blacklistsShawn Rutledge2017-10-222-24/+0
| | | | | | | | | | | | | | | | Task-number: QTBUG-62668 Task-number: QTBUG-62628 Task-number: QTBUG-62631 Change-Id: If3220bf00a4729573be4b85755897586105b55a2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Docs: fix qtquickcontrols2-customize.qdocJ-P Nurmi2017-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | qtquickcontrols2-customize.qdoc:558: warning: Command '\skipto' failed at end of file 'qtquickcontrols2-menu-custom.qml' qtquickcontrols2-customize.qdoc:573: warning: Command '\skipto' failed at end of file 'qtquickcontrols2-menubar-custom.qml' Change-Id: Ica50d42e53522bdcb31fbc38f870856aa036f549 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | qquickapplicationwindow_p.h: make REVISION comment qdoc-compatibleJ-P Nurmi2017-10-201-1/+1
| | | | | | | | | | | | | | | | qquickapplicationwindow_p.h:149: warning: Failed to parse token /*REVISION 3*/ in property declaration Change-Id: If63cb8a5beaa1e738ffe51b73b0a4817ce0c16fc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Docs: remove bogus example image links for the Imagine styleJ-P Nurmi2017-10-201-96/+0
| | | | | | | | | | | | | | | | These assets were removed in cd7aae. Task-number: QTBUG-63895 Change-Id: I6f7c6d179723191708403f90f99e5c11b9f84fa7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Revert "SwipeDelegate: grab the mouse when accepting a press event"J-P Nurmi2017-10-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit 31d90e308e46d644d74e9434ce31dd664677bc59 without bringing back the blacklists that were added in commit 4d12ab2c6a62e2771e7cc9c2c67ab48962987421. These explicit grab calls are no longer needed. The root cause was fixed in qtdeclarative commit 2dd530ca35032465d4e928aa7c8f29563eb0c5da. Change-Id: Ie22b05ee00cd6e104d99732eddcd9d0652b6a7e0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | 9-patch export plugin for SketchJ-P Nurmi2017-10-183-1/+44
| | | | | | | | | | | | | | | | This plugin crops upscaled 9-patch PNG assets when exported from Sketch, to ensure that 9-patch borders remain 1px wide when upscaled. Change-Id: Iad46d75f37b76eecf64ac32fa38d2b9e9db8b34d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_sanity: fix "empty filename passed to function" warningsJ-P Nurmi2017-10-181-3/+6
| | | | | | | | | | Change-Id: Ia1e633af6c64c9e2d538a2d4076e0bdd9667e01e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: replace generated assets with exported assetsJ-P Nurmi2017-10-181264-0/+0
| | | | | | | | | | | | | | From now on, the assets are maintained via imagine.sketch. ;) Change-Id: Icee606115cb149f3c99b8d9b768ccb080ad909be Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update imagine.sketchJ-P Nurmi2017-10-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove @1x from - applicationwindow-overlay-modal - menuitem-arrow-disabled - rename - button-background-disabled-checked -> button-background-checked-disabled - add missing - combobox-background-editable-focused - combobox-background-focused - dial-handle-hovered - delaybutton-background-focused - drawer-overlay - drawer-overlay-modal - remove checkable states for button Now the exported assets match with the files generated by imaginator. Change-Id: Icc73cd526227150b344512d08027f772a53acac2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: add support for file selectorsJ-P Nurmi2017-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For example: assets/ |__ button-background.9.png |__ +custom/ |__ button-background.9.png $ QT_FILE_SELECTORS=custom ./myapp Change-Id: I26f0b82885aa1a8e62fb4e3e58c7d8b19012406e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: add "qt.quick.controls.imagine" logging categoryJ-P Nurmi2017-10-172-0/+8
| | | | | | | | | | | | | | | | | | | | The output helps to debug image asset selection. For example: qt.quick.controls.imagine: "button-background" () -> "path/to/button-background.9.png" qt.quick.controls.imagine: "button-background" ("hovered") -> "path/to/button-background-hovered.9.png" Change-Id: I3aee85d357d9b9436341bfb06486e5b3089ce86f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: remove bogus assetsv5.10.0-beta2J-P Nurmi2017-10-1664-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - flat buttons don't need checkable assets (checkable-checked vs. checked, and checkable-highlighted vs. highlighted look identical) - delegates don't need a checked background, because the checked state is visualized by the indicator - text editors have no pressed state - mirrored page-indicator is unnecessary because it looks identical (if a mirrored version was needed, then we would need to provide mirrored versions of all states including pressed, current...) Change-Id: I909f639bdcf9d9653c56b8ce2eda49b3219bdf77 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add manual test for SystemTrayIconFriedemann Kleint2017-10-166-0/+170
| | | | | | | | | | Change-Id: Icada48c4f819906c6a1fc6bd98dd18e64bf1471b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-1216-36/+182
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/quicktemplates2/qquickbuttongroup.cpp src/quicktemplates2/qquickoverlay.cpp tests/auto/controls/data/tst_buttongroup.qml Change-Id: Iae23aaf039c6095007966475294e93220dbead84
| * QQuickPlatformDialog: fix clazy-qenumsJ-P Nurmi2017-10-101-1/+1
| | | | | | | | | | Change-Id: I6b9e31919502fb2f47e4b3657302a745c9f85b23 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Platform: fix clazy-range-loop findingsJ-P Nurmi2017-10-103-11/+11
| | | | | | | | | | | | | | Avoid accidental detach with C++11 range for loops. Change-Id: I2a105ef5a2505d26ee086974177f8f1e4040b522 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Ensure that the last screenshot can be openedMitch Curtis2017-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | Ensure that lastSavePath (now lastSaveUrl) is converted to a URL correctly by constructing it from screenshotsDir rather than screenshotsDirStr. It was resolved as a qrc path previously. Change-Id: I5ccdad6166b3927a149875b6ff89ff53c2440c05 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: state which input devices cause certain signalsMitch Curtis2017-10-101-6/+6
| | | | | | | | | | Change-Id: Ib56041e69547e03d7db10974d4638748f99fd2bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix the QML context of popup background dimmersJ-P Nurmi2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were accidentally passing QQuickOverlay as a QML context parent for dynamically created popup background dimmers. There is only one overlay per window, and the overlay is not destroyed when a popup is destroyed. QQuickOverlay is just a visual parent item for popup background dimmers, but the actual owner is QQuickPopup. Make sure to pass the popup instance as a QML context parent to ensure that the popup background dimmer's QML context is cleaned up when the popup is destroyed. Task-number: QTBUG-63672 Change-Id: I5cabbcef5035cef40af3c9edbcd8f7ae3157bd8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add missing title customization for GroupBoxMitch Curtis2017-10-102-0/+8
| | | | | | | | | | | | Task-number: QTBUG-63618 Change-Id: I6a32158726e4425dc24c24f4f9dc9cc80aa462bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+79
| |\ | | | | | | | | | Change-Id: Idbaf1791ffca20c4961bea16bb411720bbcac062
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-271-0/+79
| | | | | | | | | | | | | | | Change-Id: I976ebebb69e583963f9578fb007fb008311a22b4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: Ifaa644970cd8da55d02c1af76acd3ce8fbedb6da
| * | tst_combobox: attempt to stabilize test_mouse()J-P Nurmi2017-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Disable hover to avoid unexpected changes. Task-number: QTBUG-60480 Change-Id: I22fab5c95daa42f3c84437072bce49cac5c705af Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QQuickScrollView: fix binding loop with wrapping TextAreaJ-P Nurmi2017-09-282-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start keeping track of the content size only after the component is complete, to avoid creation time ping pong with content size updates and content item resizing. Task-number: QTBUG-62325 Change-Id: I4b75dc398d0b746dd7e0b04291270f47f91bb7e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: remove stray semicolons from SwipeDelegate snippetMitch Curtis2017-09-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I859b61880da16f6c58967700b179f35df656ed77 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | QQuickButtonGroup: track the checked button with a QPointerJ-P Nurmi2017-09-282-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A destroyed button removes itself from a group, but because of the workaround added for QTBUG-52358, there's a moment after clear() when a button is removed from a group and before it is added back to the group. If the button gets destroyed during that period, the group ends up with a dangling pointer. Task-number: QTBUG-62946 Task-number: QTBUG-63470 Change-Id: If994f87b221a7e77f56458866c4d132365c45d6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Refactor imagine.sketchJ-P Nurmi2017-10-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - split to page per control - define a palette and used shared styles - use shared symbols for 9-patches, indicators, handles, etc. - minor geometrical fixes here and there Change-Id: Ib6992f5ce2f57193ac893684bed43f039f22a815 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: Remove reference to $PWD variable in the doc configVenugopal Shivashankar2017-10-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the environment variable is not resolved on Windows platform, leading to documentation build failure. Task-number: QTBUG-63626 Change-Id: Ia37a3f7f35007f6756f1b99422d7d6b70b9ae10f Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | QQuickImageSelector: fix clazy-qvariant-template-instantiationJ-P Nurmi2017-10-101-2/+2
| | | | | | | | | | | | | | | Change-Id: I61f56c8806f02da2cab2ecf8452598431d921ca6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: fix Action snippetsJ-P Nurmi2017-10-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | These actions should be checkable. Task-number: QTBUG-63674 Change-Id: If24f00951dc3959df27482fbad844ebeb723b37d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickAction: don't uncheck the checked action of an exclusive groupJ-P Nurmi2017-10-092-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | The logic is adapted from QAction::activate(). Task-number: QTBUG-63674 Change-Id: I7af127ea917e40e6a8ca99c2528362cf6ad283b8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickActionGroup: add missing default propertyJ-P Nurmi2017-10-092-0/+20
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63674 Change-Id: I7e8eef4080f123ba5ad6b9ffa8bd8613c1b7b724 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Imagine: set icon properties as we do for ButtonMitch Curtis2017-10-061-1/+9
| | | | | | | | | | | | | | | Change-Id: Iac93ca277883984ef99ffc34acade32f7b4ce434 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Fix imagine.sketchJ-P Nurmi2017-10-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - fix content padding for delegates - fix switch indicator size - fix combobox content padding - fix groupbox content padding - fix progressbar - fix delaybutton radius - fix popup overlay - fix dial background - fix tooltip content padding - fix combobox - fix popups - fix appwindow background - fix itemdelegate-background colors - fix radiodelegate-background - fix pane padding - fix radiodelegate-indicator-pressed color - fix pageindicator - fix sliders and range sliders - fix scrollbar & indicator - fix slider progress color - fix spinbox - fix switch - fix tabs - fix textfield padding - fix toolbar, button, separator - fix drawer - fix partially checked checkbox indicator - fix checkbox pressed indicator color - fix checkbox & delegate checkmark - fix dial handle size - fix dialogbuttonbox padding Change-Id: Idbbed7c7f80c754b3852b49e0720a02fbecfca49 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | testbench: fix modal dialogJ-P Nurmi2017-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Background dimming was disabled for modal dialogs. Change-Id: I52f544364b59387249b96d4db243ad3a0982c322 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Improve testbenchMitch Curtis2017-10-064-236/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a "Fix Custom Assets" action with shortcut - Organize the settings dialog into groups so it's easier to see which options are Imagine-only. Change-Id: I20fe7ba63b3bf7770f6ca553780c47f021217ea2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Imagine: remove bogus spinbox assetsMitch Curtis2017-10-058-0/+0
| | | | | | | | | | | | | | | | | | | | | These were incorrectly generated and are not used. Change-Id: Iec5fbdbaccce96722fa9ff1adefd43ecbcc4aebb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | testbench: fix orientation for horizontal ScrollBar & ScrollIndicatorv5.10.0-beta1J-P Nurmi2017-10-042-2/+2
| | | | | | | | | | | | | | | Change-Id: I1badecf98edb5174aa4cca71553e68bf20692801 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: fix button-backgroundJ-P Nurmi2017-10-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Vertical content padding was off by one, and some flat buttons had wrong gray shade. Now buttons look identical when toggling between default and exported assets. Change-Id: I7d9bddb479292c18f500b0044a38a5ae420e6e59 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: remove white solid backgroundJ-P Nurmi2017-10-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the assets, exluding some handles and indicators, had a solid white background (for the entire image). In general, nothing should have a solid background, but the areas around button corners, slider track and so on should be transparent. This patch simply selected all exportable assets and unchecked "Background color". Change-Id: Idebc0811290e8617f1a8cf5c3ebef665f02b8b62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: fix menuseparator-backgroundJ-P Nurmi2017-10-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove the solid white background, and make the 1px dots rectangles instead of lines. Change-Id: If31059bdbe10e04bcf9ff5b060c390761c0b4921 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | imagine.sketch: fix frame-backgroundJ-P Nurmi2017-10-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Sketch has known issues with 1px line elements. Use rectangles instead of lines for marking the content area. Change-Id: Idd3d1380637f0baeea206c0971f8fef3b1387cd2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 21:55:18 +0000