aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/imagine
Commit message (Expand)AuthorAgeFilesLines
* Bump import versionsJ-P Nurmi2018-03-0146-170/+170
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-273-3/+3
|\
| * Update versions in the docs and .prosJ-P Nurmi2018-02-262-2/+2
| * DialogButtonBox: workaround implicit size calculation with one buttonv5.11.0-beta1J-P Nurmi2018-02-221-1/+1
* | Bump QtQuick.Templates import versionsJ-P Nurmi2018-02-2342-42/+42
* | QQuickTextArea: add placeholderTextColor propertyYulong Bai2018-02-211-3/+3
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-211-0/+1
|\|
| * Imagine: declare missing QtGraphicalEffects dependencyJ-P Nurmi2018-02-201-0/+1
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-191-1/+1
|\|
| * GroupBox: fix background y and height assignmentsMitch Curtis2018-02-161-1/+1
* | Add DialogButtonBox::buttonLayoutJ-P Nurmi2018-02-171-1/+1
* | TextField: restore placeholder text color fixesJ-P Nurmi2018-02-161-1/+1
* | QQuickTextField: add placeholderTextColor propertyYulong Bai2018-02-151-3/+3
* | Cleanup unnecessary explicit references to QPlatformThemeJ-P Nurmi2018-02-151-2/+2
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-153-8/+2
|\|
| * Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-122-2/+2
| |\
| | * Editors: tweak placeholder text colorJ-P Nurmi2018-02-052-2/+2
| * | Fix memory leak in QQC2Simon Hausmann2018-02-071-6/+0
* | | Promote QQuick(Proxy)Theme from libQQC2 to libQQT2J-P Nurmi2018-02-151-1/+1
* | | Read :/qtquickcontrols2.conf in QQuickStylePluginJ-P Nurmi2018-02-153-6/+16
* | | QQuickToolTip: add non-attached show() and hide() methodsYulong Bai2018-02-061-1/+1
|/ /
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-208-43/+42
|\|
| * Imagine/Switch(Delegate): cleanup internal IDs for deferred executionJ-P Nurmi2018-01-182-4/+6
| * Imagine/DelayButton: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-11/+10
| * Imagine/ProgressBar: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-15/+16
| * Imagine/BusyIndicator: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-3/+3
| * Imagine/GroupBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-5/+4
| * Imagine/SpinBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-4/+2
| * Tumbler: qualify references to visibleItemCount with "control"Mitch Curtis2018-01-171-1/+1
* | Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2018-01-162-9/+8
|\|
| * ComboBox: fix popup's deferred execution for the new stylesJ-P Nurmi2018-01-151-4/+4
| * Tumbler: cleanup internal IDsJ-P Nurmi2018-01-151-5/+4
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-098-54/+25
|\|
| * Respect user font settings from qtquickcontrols2.conf fileMitch Curtis2018-01-032-46/+4
| * Imagine: cleanup unnecessary property assignmentsJ-P Nurmi2017-12-205-8/+0
| * Update plugins.qmltypes for stylesJ-P Nurmi2017-12-131-0/+21
* | Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2017-11-061334-7/+72
|\|
| * Imagine: round Slider handle position to avoid artefactsMitch Curtis2017-11-021-2/+2
| * Imagine: enable caching for image lookupsv5.10.0-beta3J-P Nurmi2017-10-261-4/+17
| * 9-patch export plugin for SketchJ-P Nurmi2017-10-182-0/+43
| * Imagine: replace generated assets with exported assetsJ-P Nurmi2017-10-181264-0/+0
| * Update imagine.sketchJ-P Nurmi2017-10-181-0/+0
| * Imagine: add support for file selectorsJ-P Nurmi2017-10-171-1/+2
| * Imagine: add "qt.quick.controls.imagine" logging categoryJ-P Nurmi2017-10-172-0/+8
| * Imagine: remove bogus assetsv5.10.0-beta2J-P Nurmi2017-10-1664-0/+0
* | Add QQuickSpinBox::displayTextJ-P Nurmi2017-10-251-1/+1
* | Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2017-10-1211-3/+11
|\|
| * Refactor imagine.sketchJ-P Nurmi2017-10-111-0/+0
| * QQuickImageSelector: fix clazy-qvariant-template-instantiationJ-P Nurmi2017-10-101-2/+2
| * Imagine: set icon properties as we do for ButtonMitch Curtis2017-10-061-1/+9