aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use horizontal|verticalPaddingJ-P Nurmi2018-03-017-14/+7
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-2726-108/+244
|\
| * Update plugins.qmltypesJ-P Nurmi2018-02-262-78/+185
| * Update versions in the docs and .prosJ-P Nurmi2018-02-2618-21/+21
| * Fix quickCancelDeferred()J-P Nurmi2018-02-261-4/+5
| * DialogButtonBox: workaround implicit size calculation with one buttonv5.11.0-beta1J-P Nurmi2018-02-225-5/+33
* | QQuickTheme: don't inherit QPlatformThemeJ-P Nurmi2018-02-278-45/+106
* | Fix fonts and palettes in apps without :/qtquickcontrols2.confJ-P Nurmi2018-02-262-6/+8
* | Use horizontal|verticalPaddingJ-P Nurmi2018-02-2321-44/+22
* | Bump QtQuick.Templates import versionsJ-P Nurmi2018-02-23220-220/+220
* | QQuickTextArea: add placeholderTextColor propertyYulong Bai2018-02-2110-15/+68
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-2112-18/+92
|\|
| * Material: fix ItemDelegate's vertical paddingJ-P Nurmi2018-02-201-0/+2
| * Imagine: declare missing QtGraphicalEffects dependencyJ-P Nurmi2018-02-201-0/+1
| * Fix tst_swipedelegate::test_eventsToLeftAndRight()J-P Nurmi2018-02-201-2/+2
| * tst_switchdelegate: fix test_mouse/test_touch failuresJ-P Nurmi2018-02-201-6/+6
| * QQuickStyle: fix and test QT_QUICK_CONTROLS_CONFJ-P Nurmi2018-02-209-1/+50
| * Reset QQuickStyle when the QtQuick.Controls 2 plugin is unloadedJ-P Nurmi2018-02-202-9/+34
* | Material: use 8 px vertical padding for ItemDelegateMitch Curtis2018-02-213-8/+3
* | Document the normal and dense Material style variantsMitch Curtis2018-02-215-0/+242
* | screenshots: account for header and footer in window heightMitch Curtis2018-02-201-1/+1
* | Add Dense Material style variant for desktopMitch Curtis2018-02-1929-53/+234
* | QQuickMaterialStyle: init the globals from the pluginMitch Curtis2018-02-193-74/+70
* | Bump versionOswald Buddenhagen2018-02-191-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-1913-38/+53
|\|
| * Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-181-0/+4
| |\
| | * Doc: mention QT_QUICK_CONTROLS_CONF in conf docsMitch Curtis2018-02-121-0/+4
| * | GroupBox: fix background y and height assignmentsMitch Curtis2018-02-166-11/+11
| * | Material: sync CheckDelegate's vertical padding with other delegatesMitch Curtis2018-02-161-2/+2
| * | Document how to position a popup in the center of the windowMitch Curtis2018-02-163-19/+31
| * | Examples: don't use anchors in layoutsMitch Curtis2018-02-162-6/+5
* | | Material: specify the desired button layout in the styleJ-P Nurmi2018-02-173-12/+1
* | | Add DialogButtonBox::buttonLayoutJ-P Nurmi2018-02-1710-12/+104
* | | Tumbler: add positionViewAtIndex() functionMitch Curtis2018-02-164-2/+126
* | | TextField: restore placeholder text color fixesJ-P Nurmi2018-02-163-3/+3
* | | Tests: cleanup QPlatformTheme referencesJ-P Nurmi2018-02-152-116/+114
* | | QQuickTextField: add placeholderTextColor propertyYulong Bai2018-02-1510-14/+67
* | | Cleanup unnecessary explicit references to QPlatformThemeJ-P Nurmi2018-02-154-19/+19
* | | Move QQuickControlPrivate::themeFont|Palette() to QQuickThemeJ-P Nurmi2018-02-1536-96/+100
* | | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-1538-355/+679
|\| |
| * | testbench: remove hovered states as the property is read-onlyv5.11.0-alpha1Mitch Curtis2018-02-142-12/+1
| * | testbench: set checked on ButtonMitch Curtis2018-02-141-0/+1
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-0/+49
| |\ \
| | * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+49
| * | | QQuickStackView: transfer focus to the current itemJ-P Nurmi2018-02-132-10/+23
| * | | Merge tst_drawer.qml to tst_QQuickDrawerJ-P Nurmi2018-02-132-118/+37
| * | | Docs: fix qdoc (clang) warningsJ-P Nurmi2018-02-133-3/+3
| * | | Docs: update the version table for Qt 5.11J-P Nurmi2018-02-131-0/+5
| * | | Universal Dial: decrease handle size from 20 to 14Mitch Curtis2018-02-131-2/+2
| * | | Material Dial: decrease handle size from 14 to 10Mitch Curtis2018-02-131-2/+2