aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove dependencies from sync.profileOswald Buddenhagen2016-11-061-14/+0
| | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Icdcaa7ad856eb493448398f9180ecc4b642262d9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix compilation without QProcess supportv5.6.2Maurice Kalinowski2016-08-101-0/+4
| | | | | Change-Id: I85b2baec60f700a9246e6ce177e7079b8e791ad2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix tst_tumbler after Flickable changesJ-P Nurmi2016-08-091-0/+1
| | | | | | | | See qtdeclarative commit ebf07c3f for more details. Task-number: QTBUG-55179 Change-Id: Ie7d855396148c892077381666e0200180dda02bd Reviewed-by: Liang Qi <liang.qi@qt.io>
* Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-182-2/+2
| | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I1612c3725ba38b7a1e5840810f565e173281f700 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-310-0/+0
|\ | | | | | | Change-Id: I60fa2daaf08b89567bcc645a5dc0654720273418
| * QQuickStackView: fix buildv5.6.1-1v5.6.1Liang Qi2016-05-252-1/+4
| | | | | | | | | | | | | | | | error: no matching function for call to 'QQmlComponentPrivate::initializeObjectWithInitialProperties(QV4::ScopedValue&, QQuickItem*&)' (cherry picked from commit 6fe784b9696fc19eb8f2ba24f187d2cea4434c53) Change-Id: Ic3db50f44912d9e5cdb71f6712fff554fc76505e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQuickStackView: fix buildLiang Qi2016-05-202-1/+4
| | | | | | | | | | | | | | | | error: no matching function for call to 'QQmlComponentPrivate::initializeObjectWithInitialProperties(QV4::ScopedValue&, QQuickItem*&)' (cherry picked from commit 6fe784b9696fc19eb8f2ba24f187d2cea4434c53) Change-Id: Ic175bb290dcfbb944fee7545d3b97be8a202896a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Bump versionOswald Buddenhagen2016-05-191-1/+1
|/ | | | Change-Id: I54cd96a80f61c9be728b3e59c43dcd276d174bea
* Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ia37e1223008592f0d410155611e41918825f55fd Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-065-5/+5
| | | | | | | | Use the pre-defined macro. Change-Id: Ie2b5a93f0b6ed16276b80fcb9e118a49a055194c Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* QQuickContainer: fix invalid reads reported by ValgrindJ-P Nurmi2016-05-021-11/+17
| | | | | | Change-Id: I52cf46dab51382c9184a9dda7107154e52df74ef Task-number: QTBUG-52731 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickSwipeViewAttached: remove danling item change listenerJ-P Nurmi2016-04-271-5/+14
| | | | | | Change-Id: I40d3b50153bead01150284b2a5c3f45dbe486462 Task-number: QTBUG-52731 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickMenu: fix an uninitialized member variableJ-P Nurmi2016-04-271-0/+1
| | | | | | | | Also found with Valgrind. Change-Id: Ibde7714e15296d36f4cf34b5d004322531138271 Task-number: QTBUG-52731 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix QQuickApplicationWindowAttached::windowChange()J-P Nurmi2016-04-271-0/+9
| | | | | | | | | | | | QQuickWindow::windowChange() is emitted from QQuickWindow destructor. This means, that QQuickApplicationWindow destructor has been already executed, and thus, QQuickApplicationWindowPrivate has been deleted. The issue was found with Valgrind. A workaround is to explicitly reset the d-pointer so that we can test whether it's still valid. Change-Id: I82d388d8aae18886ec92ef09c745a1c045f46a39 Task-number: QTBUG-52731 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Material: fix ProgressBar heightNikita Krupenko2016-04-261-1/+1
| | | | | | | The 1px padding at the top and at the bottom are unnecessary. Change-Id: I0d6d2a5753cf987ab2782afa5d5dd2bb2c739568 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Material: update palette on primary/accent color changeNikita Krupenko2016-04-202-0/+49
| | | | | | Task-number: QTBUG-52631 Change-Id: Ib1649f44cdbc14770b1759ef7f4d7ea92f148cc1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Flatten and rename example install path and directory structureMitch Curtis2016-04-1953-4/+4
| | | | | | | Change-Id: Ib04e79d72c37fa4507517da2d3b1c28ccd73eaed Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Calendar: fix docsNikita Krupenko2016-04-161-2/+2
| | | | | Change-Id: Ia0b2134e4de48ca595d63456586e471c46151ce8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: fix wrong signal on 'to' property change in CalendarModelNikita Krupenko2016-04-161-1/+1
| | | | | Change-Id: I7c3cdbbe02c71c5341684c3d9da9f1d9b0222136 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Adding prototypes for ApplicationWindow for code modelThomas Hartmann2016-04-131-0/+239
| | | | | | | | | Those have to be manually added until dependecies work in Qt Creator. Change-Id: I416065bd3a1d074bd7f5119cfc635a73e384f354 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Material: correct paddings for text edit controlsNikita Krupenko2016-04-132-7/+9
| | | | | Change-Id: Ie3e1808057af370f3f6a923a8a56709dd80223b8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: use theme cursor in SpinBoxNikita Krupenko2016-04-132-0/+27
| | | | | Change-Id: I35c3a15d17a15945ccbfa5eeb4359c7c5be3facf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Adjust qtlabscontrols.metainfoThomas Hartmann2016-04-121-10/+10
| | | | | | | | The '' confuses the designer. We will fix this but for now I change it to "". Change-Id: Ief4cfa3250e1dd1428dd972a7a10c5f6bd417033 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Doc: fix ButtonGroup::buttons typeJ-P Nurmi2016-04-111-1/+1
| | | | | Change-Id: Id78ef819c56d4639c33e7b4823c2c2600486befa Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix ScrollBars with paddingsJoni Poikelin2016-04-015-9/+25
| | | | | | | | | | Padding was not taken into account when calculating the new position, which caused there to be small offset between the mouse press and the resulting handle position by the amount of padding used. Task-number: QTBUG-52233 Change-Id: Ibd8c4375b030a27a6124aefc4bc9af570d14d3a9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ComboBox: fix usage in an asynchronous LoaderJ-P Nurmi2016-03-232-4/+29
| | | | | | | | | | | | | The following comment in QQmlDelegateModel::object() helped to find a solution ie. using createdItem() instead of initItem(): If asynchronous is true or the component is being loaded asynchronously due to an ancestor being loaded asynchronously, item() may return 0. In this case createdItem() will be emitted when the item is available. [...] Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8 Task-number: QTBUG-51972 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-224-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I40e902a2ddff05684ff90b178728c562c2cd8cd1 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Fix QQuickPopupPositionerJ-P Nurmi2016-03-221-3/+3
| | | | | | | | | | | tst_tooltip revealed a bug that QQuickPopupPositioner wasn't cleaning up its ancestor listeners properly. When QQuickPopup was destructed, it left a listener on the window root item. When the root item got later destructed, it tried to call a listener (the popup) that was already deleted. Change-Id: If041458da24be927f0bad19b9549dcabd1931977 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Popup: fix marginsJ-P Nurmi2016-03-215-7/+85
| | | | | | Change-Id: I09f974a00a5a2a8f14645ff5d9bfbd6bad03d324 Task-number: QTBUG-51990 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickOverlay: fix background visibility for multiple modal popupsJ-P Nurmi2016-03-172-1/+41
| | | | | | | | | | | | The idea of the "modalPopups > 1" check was to avoid calling QQmlProperty::write(), but it missed the fact that one modal popup might be still closing while a new modal popup is already opened. Thus, there's temporarily 2 modal popups visible, and we must transition the overlay background according to the state of the last shown modal popup. Change-Id: If25d83ccaa5adc29a9bc8d660f41fb66f90fb167 Task-number: QTBUG-51916 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: use proper shades for dark theme colorsNikita Krupenko2016-03-172-16/+29
| | | | | | | | This fixes colors for checked switch dark theme and raised highlighted button in both themes. Change-Id: I3c485fb1b779104d6d7f682921b34cb535312f7c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Change locale inheritance for popupsJ-P Nurmi2016-03-175-101/+173
| | | | | | | | | | The last one in the series of making Popup inherit its properties from the parent window instead of the parent item. The same change was done for font and style already. Change-Id: I7024cce13f501e92024e9110e87ed33bbae6533d Task-number: QTBUG-50984 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickStyle: fix random crashes accessing deleted QQuickPopupItemJ-P Nurmi2016-03-172-15/+8
| | | | | | | | | | Don't access QQuickPopupItem while being destroyed. The popup item is deleted in QQuickPopup destructor, which is the parent of QQuickStyle that is attached to a popup. We don't need to remove the listener in this case. Change-Id: I0e0dba533b3b1299eb0d266c92f3070bb193c6c9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: corrected default, ToolButton and checkable controls fontsNikita Krupenko2016-03-163-13/+19
| | | | | | | | | According to Android sources, ToolButton has the same font, as other buttons and checkable controls use default (system) font. Also, set proper size for default font. Change-Id: I355ab57ef476918bab346538fefbd6c0209d2221 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Store explicit and resolved font separatelyJ-P Nurmi2016-03-1510-139/+181
| | | | | | | Change-Id: I80bd45244077cd75f24c4ca1af6485f4c6a23b39 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Change style inheritance for popupsJ-P Nurmi2016-03-156-17/+44
| | | | | | | | | | | | | | | | | | The decision to make popups inherit theme & accent from its parent item was driven by ComboBox. However, in many cases it has an undesired side effect, so we've changed Popup to inherit its style attributes from the parent window instead, just like we did for fonts. The only exception to this is ComboBox, where the popup is an integral part of the control. This special case is now handled in the respective style implementation. A concrete example is that we can now specify dark theme by default for Material style ToolBar to get a better matching light text against the colorful background. In Gallery, this won't effect the options menu, which is a child of a ToolButton. The menu retains light theme along the rest of the application. Change-Id: Ibdc8fcf5b5fa258d853410a9b40368472424a8c6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Revert popup style inheritance changesJ-P Nurmi2016-03-151-54/+36
| | | | | | | | | | | This is a partial revert of "Fix style inheritance" (07e0dec) and "Fix style inheritance for popups" (a3dddf0). These changes made things too complex. It's easier to revert back to the original, and then apply the new popup style inheritance rules in the next commit. Change-Id: I2842261999d258a709739ee48a78ca23a2a1092a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickControlPrivate::themeFont(): clear system font's explicit attrsJ-P Nurmi2016-03-151-3/+7
| | | | | | | | | | | | The default system font must not have explicit attributes that would mess with font inheritance. This is already handled by the QFont() default constructor, but we must do it ourselves when we call QPlatformTheme::font(SystemFont) directly. Change-Id: Ia52e135411618e72cbf4618cffb9eec7924dc612 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Test Universal fontsJ-P Nurmi2016-03-111-0/+21
| | | | | | | Change-Id: I0daf4eb22d879e0b3e52ff16c9dd7b30a617001f Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Test Material fontsJ-P Nurmi2016-03-111-0/+41
| | | | | | | Change-Id: Id80b0e851c82eecd6a8ae32f436b1a4bde0df40a Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Doc: fix a typo for Control.localeLiang Qi2016-03-111-1/+1
| | | | | | Change-Id: I37ad466462d42101fd16e8a09fe0c8486115f422 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix popup fontsJ-P Nurmi2016-03-115-66/+68
| | | | | | | | | | | This is a partial revert of a405919. This change makes popups inherit the window font instead of the parent item font. Change-Id: Ie360e3831aadbd167859e17d381edf3a28945300 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Revert "QQuickControl: delayed the call of resolveFont()"J-P Nurmi2016-03-113-1/+10
| | | | | | | | | | | | | | | This reverts commit 3cba8b19c4e67cbcd6977bf141d7ddf2e54aae85. The change was done to implement font inheritance for popups, but it broke theme fonts for other controls. Since the former was a mistake (see comments in the linked bug report), it's best to revert back to what worked with theme fonts. Change-Id: I863765c5061b02607cfe04a848ff39e3243bd25f Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* tst_material/universal: use the appropriate styleJ-P Nurmi2016-03-116-0/+20
| | | | | | | | | | | | The main purpose of these tests were to test the attached property and its inheritance, so it didn't matter which particular style was active while running the tests. However, it simply looks better if they run with the appropriate style, and this also allows us to add style-specific tests (such as font attributes). Change-Id: I827f26e469bce3445ffe7e24d6299bcfb587d849 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix font comparisonsJ-P Nurmi2016-03-119-13/+227
| | | | | | | | | | | | | | | | | | | | When inheritance of explicitly set font attributes is involved, it is important to compare the resolve mask in addition to comparing the attribute values to avoid losing the information whether a specific attribute is set explicitly. For example, QFont::operator==() returns true for two fonts that are both bold regardless of whether only one of them has explicit weight set. Therefore, setFont() must not ignore fonts resolve mask. Furthermore, the fontChanged() notifier must be emitted only if the actual attribute values change, not if only the resolve mask changes. Change-Id: I2eb7a071c0eaecd2f8d2f6074c4ce6ed6764a6e9 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QQuickPopup: fix possible referencing of a destroyed parent itemJ-P Nurmi2016-03-101-0/+1
| | | | | | | | | | The internal popup positioner is already listening for itemDestroyed() of the parent item, so it may as well reset the parent item pointer of the popup to avoid having the popup referencing a destroyed parent in complex tooltip auto test cases coming up in 5.7. Change-Id: I463403e528c33285ea7d51b68d0f5020a239e98e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix QQuickPopupItemPrivate::implicitWidthChanged()J-P Nurmi2016-03-101-1/+1
| | | | | Change-Id: Ib822b57da21b338c7b11cae115f1bb6a178d7328 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QQuickSpinBox: add missing null checkJ-P Nurmi2016-03-091-4/+7
| | | | | | | In auto tests, the engine might be null during destruction. Change-Id: I0556c746f6c47198afc937da052106d3f8c35558 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix static buildsMitch Curtis2016-03-071-1/+1
| | | | | | | | | | | The error was: Error in '.rcc\debug\qmake_Qt_labs_controls.qrc': Cannot find file 'C:/dev/qt5.7/qtquickcontrols2/src/imports/controls/designer/images/*.png' Change-Id: Icfd1225e8c130d8d48f821af981b64202c687956 Task-number: QTBUG-51708 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* SwipeView: cull items outside the viewJ-P Nurmi2016-03-071-0/+1
| | | | | | | | | | | | This hides them until they become visible in the view. Hiding them explicitly is not an option, because then they will never show up. This technique is used in QQuickItemView::initItem() and FxViewItem::setVisible(). Change-Id: I3a3779e11a57c6dcf94ffc834f6e920449aea74a Task-number: QTBUG-51078 Task-number: QTBUG-51669 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 23:09:14 +0000