| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In upcoming patches, we start registering C++ types declaratively.
A condition of doing so requires that each .pro corresponds to one
QML module. This conflicts with the QtQuick.Controls import, which
currently does quite a lot:
- Registers (and selects) QML files for the style that was set
- Registers private C++ utility types (such as IconLabel) that are
useful for all styles under the QtQuick.Controls.impl import
- Registers private C++ types that are only useful for the Default
style (such as BusyIndicatorImpl).
The reason it does so much can probably be explained by the
intended usage of Qt Quick Controls 2; when you do
import QtQuick.Controls 2.0
you get access to the QML types (e.g. Button) that the style
you're using provides. So if you're using the Material style,
you'll get a Material style button. API-wise, the button is
identical to any other button, because the types in
QtQuick.Templates are what we advertise as the public API.
If we didn't have this functionality, users would need to
import specific style imports to use controls, and the
convenience of being able to simply start the application
with a different style by e.g. passing an application argument
would be lost.
To support declarative registration of types while also supporting
the existing use cases, we split out the Default-style-specific
stuff into a QtQuick.Controls.Default import.
Task-number: QTBUG-82922
Change-Id: Ib4f1620cae78d7acdc13d9ac0752a020bc22f3ea
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change makes all Qt Quick Controls 2 imports match the current
Qt minor version, which is 12 as of this patch.
It also updates all other Qt Quick imports to match.
This will also make future version bumps easier as all version numbers
in existing code/docs will match.
The following commands were used to verify that no old versions remain:
for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done
for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done
[ChangeLog] From Qt 5.12 onwards, all import versions in
Qt Quick Controls 2 follow the same minor version as Qt's
minor version number. For example, the import version for Qt 5.12 is:
"import QtQuick.Controls 2.12".
Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3
Fixes: QTBUG-71095
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/imagine/TextArea.qml
src/imports/controls/imagine/TextField.qml
tests/auto/controls/data/tst_tumbler.qml
Change-Id: I25a8228a4299fb7a53db70b7223663a1637ed933
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The placeholder text's renderType should cohere to the renderType of
the control. This is already the case for font, and sometimes color
too.
This solution avoids the need to expose a new property.
Task-number: QTBUG-68769
Change-Id: I6711aea83b7b8ee27f56b9c905aa4870465e3fd9
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Same as 5adce042 for QQuickControl.
[ChangeLog][Controls][TextArea] Added topInset, bottomInset, leftInset,
and rightInset properties to control the geometry of the background
similarly to how paddings control the geometry of the contentItem.
Change-Id: I1e1b3a79a9f477ec7b64ec4c6cc8021bbf48adc0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Same as 5bd9d44b for QQuickControl.
[ChangeLog][Controls][Label] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
[ChangeLog][Controls][TextArea] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
[ChangeLog][Controls][TextField] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
Change-Id: Idcc2d9af8df086b41c15f352506fd8afdbb2e3e7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
QT_VERSION in qtbase has been updated. All the import numbers that now
follow the Qt version can be updated.
Change-Id: I4e9698201766b39807737c9e0279d36d4da686e2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
| |
Add placeholderTextColor property for user convenience to customize the
placeholderText color to fit the backgrounds.
[ChangeLog][TextArea] Added placeholderTextColor property for user
convenience to customize the placeholderText color to fit the backgrounds.
Change-Id: Iea0233f909ca9cfe19d88f9bc24691aa35b5ab35
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\
| |
| |
| | |
Change-Id: I2934d3f51fea9626fd2d2512786eb297d9f7fe6c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of using 50% translucent palette.text, use 50% translucent
TextField::color (which defaults to palette.text) to make the
placeholder text color follow the text color when changed directly
without changing the palette. In the future, the placeholder text
color should be exposed as a separate property to give users full
control.
Task-number: QTBUG-66176
Change-Id: I57153ff676be6518f9b48cdbd7da4089daa36853
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A half-translucent placeholder text color is also used in widgets.
Tweak the default disabled text color a little bit to make placeholder
text visible in disabled state, so that we can use the same approach
that has been proven to work. ;)
Task-number: QTBUG-63369
Change-Id: I9a3f0bf18fdfa4a25ef169b8fd9571c9c899ab26
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| | |
Change-Id: If4e13f09012c80c1043fd0ee82bbddab50b1fad5
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63331
Change-Id: I14c2b05bbf7654b298a69cdc72fc4d8756a340d0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Make editors and delegates use the "text" color role from palettes.
This color role is normally used as a foreground color for the "base"
background color.
Task-number: QTBUG-63331
Change-Id: Ic08463f54c1b04a4eccf791a576ae792f75bf89b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: I237813241b35445d3372b84b0ef2759f3d2c5bcc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Remove top-level opacity assignments to allow full customization
- Add more distinction between disable and placeholder text
- Make disabled text more visible
Task-number: QTBUG-62854
Change-Id: I2e8998fb739e4beda58978173173ca94a3759caf
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
This brings all QtQuick 2.x and QtQuick.Controls.x 2.x imports in src/
up to 2.11 and 2.4, respectively.
Change-Id: Ica2413b85f5da62a495a5d1b02ea54a9a92c0ecb
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I274146911cd8a204fcbf439da9259b0a38c8092e
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|/
|
|
|
| |
Change-Id: Ifa2a4cb46f0fc7db75b468a67000c979bf44848c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\
| |
| |
| | |
Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
|
| |
| |
| |
| |
| | |
Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The internal QQuickPlaceholderText creates an "implicit binding"
to the editor's horizontalAlignment, meaning that the placeholder
respects the editor's horizontal alignment when explicitly set,
and otherwise determines the alignment from the placeholder text's
visual direction.
[ChangeLog][Controls][TextField] Fixed the horizontal alignment
of the placeholder text in right-to-left UIs.
[ChangeLog][Controls][TextArea] Fixed the horizontal alignment
of the placeholder text in right-to-left UIs.
Task-number: QTBUG-55999
Change-Id: If1a8596c35c1920874996277520f1c54430c5f69
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Qt 5.9 == QtQuick 2.9
Change-Id: I7d4f749645011c4e78bdafe80824b83bd166e7c7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
The templates imports were missed in fb7c9541, sorry.
Change-Id: I9742f1a86b01083ae1b7c6ae48b43098be8385c5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/
|
|
|
| |
Change-Id: Ic6cd0450a13b965578a0ab8f590270f4e52ffca6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
| |
Most were importing 2.6, some 2.4, and some 2.7. Use consistently
the latest available Qt Quick version 2.8. This can be easily
tracked to the corresponding Qt version.
Change-Id: Ic231b3cc0cb5d2d5cf806fe11c4ff3fd557d09e0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
| |
This reduces all of the duplicate literals that we currently have.
Task-number: QTBUG-55867
Change-Id: I28f1f646d25f2f6578d52b4ba96f8f0f3ad6706b
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-50003
Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I7bf3a7fb9ca97e5c7ddf34f8f921d5d4be733861
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Even though there never was such thing is QtQuick.Templates 1.0,
we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0
(next step). The templates define (and in the future, revision) the
API of the controls, so the two must have the same version or it
will get messy.
Docs and plugins.qmltypes will be updated in follow up commits.
Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910
Task-number: QTBUG-52549
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
| |
This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
Change-Id: Ib653135662bfd353a73290539995e8e5be211587
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
src/templates/qquickapplicationwindow_p.h
src/templates/qquickcombobox.cpp
src/templates/qquickcombobox_p.h
src/templates/qquickpopup.cpp
Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
|
| |
| |
| |
| |
| | |
Change-Id: I423c78ab33f78032471db64804885ba60671d93b
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|/
|
|
|
|
|
|
| |
Both for TextArea and TextField.
Task-number: QTBUG-50412
Change-Id: I273c8520482ef288ee28c7cbb54e5d96623f7900
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I812f36c5ff7ca0e5cf3c7e8f866a756584a1a220
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Given the presence of alternative styles, we'd like to focus on making
the default style as performant as possible. Removing Theme usage
is a step towards this.
Change-Id: I8f76dc98442e6c02703885591a44758f40c7a362
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The same was done to QLineEdit in qtbase commit a2666d3. A quote from
the commit message:
A blinking cursor in the middle over horizontally centered
placeholder text looks bad. Thus, horizontally centered content
is now considered as an exception and the placeholder text is
hidden when the line edit is focused.
Change-Id: I5f86482c425fe878ecf6b4046dd835a0464d2150
Task-number: QTBUG-49147
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Better not expose the extra Text item in the API. Ideally it should
be implemented as a scenegraph node. We might even want to promote
the placeholderText property (and add placeholderColor) to TextInput
and TextEdit in Qt Quick core.
Change-Id: I4f443c77d1c696b87a50ee184f868713dd50316f
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Placeholder text should follow the alignment of the control itself,
so that text input appears in the same place where a placeholder was.
Change-Id: I1dfa6c2aece10eb92e62a14f347c7e1ec5e610ea
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
|
| |
Same as 0cb0962 for TextField.
Change-Id: I1538df1b31a8b7254a219923623c5dd586d65059
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ifbc8e0a221b1190becb789d69b9b313ab45e1615
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Controls 2.0 could be built with QT_NO_ACCESSIBILITY defined.
Added a few helper functions for accessible in QQuickControl.
Don't set text as Accessible.name for TextArea and TextField.
Change-Id: I40383bbcec2f8c742f709bdec0209623f80da449
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I3d1822457efd740e7c9d91747e978d787c0dd4b8
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
|
|
|
|
|
|
|
| |
Use Theme.disabledColor instead.
Change-Id: I76311d6c6b573b01a26ee2b8d434a841c4d86292
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I6fa85e9fa9a2f7c98ec751786271a60c6c050db5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
TextField and TextArea have different semantics for contentWidth
and contentHeight. In addition, it looks like we need to restore
contentWidth and contentHeight for Frame & GroupBox.
This reverts commit 6941b934bdf5f3c7b65f682c8dfc5c6562292351.
Change-Id: Ia115025a67b472ac67fbbc915b80312e4b4a7431
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ie59899d0f88a940a434b5ac9148ac453066169fd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|