| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I0e46e77186a8572c63c3eed7a99f35b948b87de3
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
|
|
|
|
|
|
|
| |
A regression introduced by 7909cd1
Change-Id: Ia7f1dd4da53619e39245cdd9cf3752c13cefad94
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
|
|
|
|
|
| |
Change-Id: I75021d5a4b54104cccaf5988f0bc79efce3c4c9f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/controls/ToolBar.qml
Change-Id: I5510496219a4ebe8bfced4192307219238ca9bb6
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-33799
Change-Id: I582518a73276d47cf63cf31411b5176a90acab6f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|/
|
|
|
|
|
|
|
|
| |
Instead of preferring the layout size, and only using the panel size
as a fallback, take the maximum of the two. This way styles can provide
a default size that will be respected. Furthermore, replace unnecessary
function calls with declarative property bindings.
Change-Id: Iabc59c694ac8c8302cea72f53c9177462d7f146c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
| |
Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
| |
Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem is that the content item of both these controls have
the focus property set to true. This property will then affect the
implicit focus logic and should be protected by a focusscope.
Currently adding a ToolBar or StatusBar to an application could
result in this content item grabbing focus implicitly even if the
application only sets focus: true on a single item.
Task-number: QTBUG-34713
Change-Id: I94cb79d25e4cfd727915f5b5ab612ad5c0132db7
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-1.0 types were introduced in Qt 5.1
-1.1 types were introduced in Qt 5.2
-The module versions are now taken from the \qmlmodule
This change was only applied to \qmltype.
For methods, signals, and properties, we keep the
\since QtQuick.Controls <version>
Task-number: QTBUG-32172
Change-Id: Iefa73d4a489aa285bae873f68ae9a228030f0115
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
| |
Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
|
|
|
|
|
| |
Change-Id: Ib0f78310c96cda29cc6ea4551b3a2c98011a11c9
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
We only cared about reserving space for the height but while
trying to actually get the minimumSize for a window based on
the toolbar content I realized that we really need to calculate
the width as well.
Change-Id: I7b55b66a2475a2355d30614095f173a39f47f2f1
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Using the implicitHeight of an item makes ToolBar and StatusBar
a lot more useable with layouts. In addition we enable the padding
property from the style, allowing its content to be positioned
in a more convenient way. This is similar to how we already do it
for GroupBox.
Change-Id: Ia2aa1bcb9ae109718fd752401400222adec242ac
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
| |
Change-Id: I9f1690524e29cd7fe0ab35be216aca9a6edd35ca
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
| |
Change-Id: I4038afc1cb22102f8873014d90dedec79cbaa376
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
| |
Change-Id: I10271c860abd9b45a262e3548628e6a3026e1a4f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-30318
Change-Id: I9839470fbac1d14c1788766d275aba3fac6ec8b1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
|
|
|
|
|
| |
Change-Id: I1fabb4efcc931f12f0a65ac5c66e6e085108269b
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
| |
This is another step towards making controls work without
the widgets module.
Change-Id: I7066d79f42d90199cfd1a5d6f6ce6cf6cae381d6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
|
|
| |
Would not contain the toolbuton's pressed shadow.
Change-Id: I989e6ec38d0632fcd4c09e1805ec3fa0133d9b93
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
| |
Change-Id: Ie23b504f590e6c4e7f2a1a9090c2dd8671389937
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
|
| |
Change-Id: Id1b7bf4c6ff1fa7286cafdc5ffe7cdab636a622b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
| |
Change-Id: If9df032c76e36f385aacd30cc31d6f02574c6f11
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
| |
We should not override the implicit size.
Change-Id: I12b8639c527e6c2170507c3ce36605ae1d839b90
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
| |
Change-Id: I82bdec248223de2dfb4ab8d1cd6cc04d5560ca5f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
| |
We want to use the same license as the other Qt modules.
QML files stay as BSD for now.
Change-Id: I10b1484f5ab0dfe2138ff7e045d0ecfd85556aa1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|