| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTBUG-60156
Change-Id: I11f59a67f5a319ac5a4eae9b8ccea5d16a983de2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I9f206c3c750fd648ba8761c574e0be94d32e940f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
A simple search'n'replace change without hidden functional changes.
Change-Id: I8e42f8ad30977630005529094eea726efa15a26d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
No more need for the clumsy and slow contentWidth and contentHeight
bindings in Pane and its derivatives.
QmlBench on TX1:
Pane: 26.4 -> 32.8 frames (~24%)
Frame: 25.4 -> 31 frames (~22%)
GroupBox: 28.6 -> 32 frames (~12%)
Change-Id: I4ba1d46ba6328de2ee0955c241d4b090127f6b85
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>
|
|
|
|
|
|
|
|
|
|
| |
Unlike the other imports that are waiting for a Qt version bump,
QtQuick.Templates contains version 2.5 registrations and is therefore
already available. Bump the template imports to make the newly added
APIs available, so we can start using horizontal|verticalPadding.
Change-Id: I651feeeeadcc9767904ca6f191e844a03b8ddea6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\
| |
| |
| | |
Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I7b8037c52892d8dfb4a38450c58101353d9d2d1f
Reviewed-by: Mitch Curtis <mitch.curtis@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>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/Drawer.qml
src/imports/controls/Frame.qml
src/imports/controls/GroupBox.qml
src/imports/controls/Page.qml
src/imports/controls/Pane.qml
src/imports/controls/ToolBar.qml
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickpopup.cpp
tests/auto/accessibility/data/busyindicator.qml
tests/auto/accessibility/data/button.qml
tests/auto/accessibility/data/checkbox.qml
tests/auto/accessibility/data/control.qml
tests/auto/accessibility/data/dial.qml
tests/auto/accessibility/data/label.qml
tests/auto/accessibility/data/menu.qml
tests/auto/accessibility/data/pageindicator.qml
tests/auto/accessibility/data/popup.qml
tests/auto/accessibility/data/progressbar.qml
tests/auto/accessibility/data/radiobutton.qml
tests/auto/accessibility/data/rangeslider.qml
tests/auto/accessibility/data/scrollbar.qml
tests/auto/accessibility/data/scrollindicator.qml
tests/auto/accessibility/data/slider.qml
tests/auto/accessibility/data/spinbox.qml
tests/auto/accessibility/data/switch.qml
tests/auto/accessibility/data/tabbar.qml
tests/auto/accessibility/data/tabbutton.qml
tests/auto/accessibility/data/textarea.qml
tests/auto/accessibility/data/textfield.qml
tests/auto/accessibility/data/toolbar.qml
tests/auto/accessibility/data/toolbutton.qml
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
|
| |
| |
| |
| |
| | |
Change-Id: Id90911cbac46d2d68284abca08dc7165ace71113
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The existence of a content item is obligatory for such controls that
alias the contentData and contentChildren properties to the data and
children properties of the content item.
Even though we created empty content items in QML to ensure one always
exists, it did not not guarantee that a content item would exist for
custom styles. Furthermore, the empty content item was unnecessarily
created and destroyed when the property was overridden for a customized
control in QML.
This change creates the content item lazily where required, ensuring
that it always exists even for custom styles, but does not create it
in case a content item is supplied from QML.
Task-number: QTBUG-54347
Task-number: QTBUG-56038
Change-Id: I714ef4f8c366f0f449b922b2c16c0ec653fbd364
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>
|
|/
|
|
|
|
|
|
|
|
|
|
| |
Controls must import templates version 2.1 in order to "inherit"
1-revisioned properties, methods, and signals. So far, this has
been done case by case, but it's less error prone and more clear
to change them all. For example, if you ever see a source file
pasted/linked somewhere, it's easy to identify the version it
belongs to.
Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786
Reviewed-by: Mitch Curtis <mitch.curtis@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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The result of:
Frame {
ColumnLayout {
RadioButton { text: "First" }
RadioButton { text: "Second" }
RadioButton { text: "Third" }
}
}
is now identical to:
Frame {
contentItem: ColumnLayout {
RadioButton { text: "First" }
RadioButton { text: "Second" }
RadioButton { text: "Third" }
}
}
Change-Id: I823b2259dabb66db0dddef41ea396f7ac1000a82
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I3c0385bc9a53083bb01b59e5d47635a28b706d75
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>
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I78f081488915dc5d80362de7ef8389433d487687
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I6fa85e9fa9a2f7c98ec751786271a60c6c050db5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I7ac0b334c23c5eb49229443f97a50491814321b4
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I79a974c64f6ec57ebfa83cea0857b2a1590af61f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I8f883dd0fd06172032dd78ff60437c906c2fe8dd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: If7964b64b6f78fc77e1095d69658e27bcb89a6f8
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
The same "w - lp - rp" and "h - tp - bp" patterns were repeated all
over the codebase. This is why availableWidth and availableHeight were
introduced.
Change-Id: I8124e8668b553a409a25aa18d775f1bf0494398d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I2a8a1c6884e65383f0938763497a419d2f0fcbd6
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I9c72db2d8f44429a7c87baaad663b88c7e1f1bb9
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|
|
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
|