aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquicktextarea.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-131-425/+0
| | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: Rename Qt Labs Controls to Qt Quick Controls 2Nico Vertriest2016-04-071-1/+1
| | | | | | | | Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iab8ca27d98a16a7c99bd364c66efc8b98d93eacc Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* Use fonts from theme for editable controlsNikita Krupenko2016-03-191-1/+1
| | | | | | | Also set proper fonts for editable controls in Material theme. Change-Id: I78b8f8597a653af593787e569d6ba5ee7bf182a9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickPressAndHoldHelper to QQuickPressHandlerJ-P Nurmi2016-03-191-18/+18
| | | | | | | | | | The editors need also pressed() and released() signals. The actual signals will be added in a follow-up commit. This just renames the class to something that is not exclusively tied to press-and-hold. Task-number: QTBUG-51009 Change-Id: Ib6c7ec9f213c0c9deb08bb450206661ec34aaa82 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Prettify the font-related codeJ-P Nurmi2016-03-161-1/+1
| | | | | Change-Id: I2e9d14a34d12a13ea67598864a4827fabf6e9677 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-161-20/+18
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickcontrol_p.h src/templates/qquickpopup.cpp tests/auto/controls/data/tst_combobox.qml tests/auto/controls/data/tst_control.qml Change-Id: Ib7853d5ee5c4444872cd5c2d789e20d229c955d1
| * Store explicit and resolved font separatelyJ-P Nurmi2016-03-151-23/+15
| | | | | | | | | | | | | | Change-Id: I80bd45244077cd75f24c4ca1af6485f4c6a23b39 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix font comparisonsJ-P Nurmi2016-03-111-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Doc: update doc Qt Labs ControlsNico Vertriest2016-03-101-1/+2
| | | | | | | | | | | | Change-Id: I49a8632b0561483e6090577ae17fd7bdeb4da6ec Task-number: QTBUG-50933 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Templates: follow the Qt coding styleJ-P Nurmi2016-02-121-21/+24
| | | | | | | | | | | | | | | | | | Return early to keep the indentation low. This style was already used in many areas, so now the same style is consistently used everywhere. Change-Id: Ibc7c05147fdcf226ad1cbdd26cd70e1da89108af Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/templates/qquickcombobox_p.h src/templates/qquickmenu_p.h src/templates/qquickmenu_p_p.h src/templates/qquickoverlay_p.h src/templates/qquickpopup.cpp src/templates/qquickpopup_p.h src/templates/qquickstackview_p.cpp Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
| * Docs: add notes about the Qt.labs moduleJ-P Nurmi2016-01-191-0/+2
| | | | | | | | | | Change-Id: I65c37f661689bf30e7a9119bb877dce68eeb634c Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | C++11 keywordsJ-P Nurmi2016-01-211-1/+1
|/ | | | | | | | - Q_NULLPTR -> nullptr - Q_DECL_OVERRIDE -> override Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickControl::focusReasonJ-P Nurmi2015-12-121-1/+47
| | | | | | | | | This allows the Universal style ApplicationWindow to visualize key/tab focus with a focus rectangle, but hide the focus rectangle when the focus moves around for other reasons (mouse, active window, popups...) Change-Id: I5c5b43d7c4c051679e34b806ee43cd80180d7ab8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add missing TextArea::pressAndHold() docsJ-P Nurmi2015-12-121-0/+8
| | | | | Change-Id: I09c42985a116feaacc9896a8f0ccaca5fd4c57f9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Control: resolve the font a bit earlierLiang Qi2015-12-011-0/+15
| | | | | | | Also applied to QQuickLabel, QQuickTextArea and QQuickTextField. Change-Id: Icf10500905980445809eb2375e8957db2c41e03c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Simplify TextField & TextArea placeholderJ-P Nurmi2015-10-301-38/+14
| | | | | | | | | | 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>
* Added QQuickControl::accessibleRole() and etcLiang Qi2015-10-291-4/+2
| | | | | | | | * m_accessibleRole was removed * also applied to QQuickLabel, QQuickTextArea and QQuickTextField Change-Id: I4b487f32cccfba0e16b3dba7e39882e8cd7ea616 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickControl: dynamically create a11y attached objectLiang Qi2015-10-211-17/+42
| | | | | | | Using QAccessible::ActivationObserver approach. Change-Id: Ib99c1f9b7b0c37a3e8a4747db265c9df77acc1f8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: disambiguate group sectionsJ-P Nurmi2015-10-201-1/+1
| | | | | | Change-Id: Ia6e8a53b8b5261e1efd80dcd3351cd216d34edf4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Docs: Input groupJ-P Nurmi2015-10-191-2/+2
| | | | | Change-Id: Iba6e3503d20e1f141c5dd81a2eeab6176e809914 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* TextArea: fix implicit sizeJ-P Nurmi2015-10-111-0/+25
| | | | | | | Same as 0cb0962 for TextField. Change-Id: I1538df1b31a8b7254a219923623c5dd586d65059 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-011-3/+3
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-1/+1
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Replaced the module name qualifier used for QML docsVenugopal Shivashankar2015-09-231-2/+2
| | | | | | | | Also made changes to avoid qdoc warnings about qml snippets. Change-Id: Ide047fe7a4901fcf4b03efdccf457662e60585d2 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: fix font rendering in Label, TextArea and TextFieldLiang Qi2015-09-181-5/+10
| | | | | Change-Id: I264e0b86dcf54623b545d695f1a23f7d4a08972b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-0/+323
Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 03:01:11 +0000