| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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: I61d779eb40e3a278aa2ef429e014d351da34f80a
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquicktumbler.cpp
src/quicktemplates2/qquicktumbler_p.h
src/quicktemplates2/qquicktumbler_p_p.h
Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This code currently works, but we prefer to use control.<property> to
access properties directly.
Change-Id: Ieba95bffdd0b0a9b33373524248d0ac06e9f2a3d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/quicktemplates2/qquickcontrol.cpp
tests/auto/sanity/tst_sanity.cpp
Change-Id: I62a79fd7788fec635b9917fc91bacd7338b547fd
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We can already cleanup the internal IDs even if Tumbler doesn't
have deferred execution enabled.
Change-Id: Ide9a0a6c6d1680c6df6b968b5702a6270fea3326
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: If4e13f09012c80c1043fd0ee82bbddab50b1fad5
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-63331
Change-Id: I5dbabc0c0a986761ce77b37c791e7a8fdd1034e2
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>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Ic6cd0450a13b965578a0ab8f590270f4e52ffca6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/Dial.qml
src/imports/controls/RangeSlider.qml
src/imports/controls/Slider.qml
src/imports/controls/Tumbler.qml
src/imports/controls/material/Dial.qml
src/imports/controls/material/RangeSlider.qml
src/imports/controls/material/Slider.qml
src/imports/controls/material/Tumbler.qml
src/imports/controls/qtquickcontrols2plugin.cpp
src/imports/controls/universal/Dial.qml
src/imports/controls/universal/RangeSlider.qml
src/imports/controls/universal/Slider.qml
src/imports/controls/universal/Tumbler.qml
Change-Id: I02b433e66109d90c63fcb9d0e5e304dc9375ea44
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
| |
[ChangeLog][Controls][Tumbler] Added a moving-property that describes
whether the tumbler is currently moving, due to the user either
dragging or flicking the tumbler.
Change-Id: Ic86d243cdbdfa8fcd7a7932264332c04a16e020a
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>
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][Tumbler] Added wrap property to control whether or not
tumbler wraps when it reaches the top and bottom.
Change-Id: I27c543d98f7bc574bc5dc882a130abe0dcc13cea
Task-number: QTBUG-53587
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This makes the fade-out effect more gradual:
Before: http://i.imgur.com/gNyHh1y.png
After: http://i.imgur.com/fsC17UE.png
With:
import QtQuick 2.6
import QtQuick.Window 2.2
import QtQuick.Controls 2.0
Window {
width: 300
height: 300
visible: true
Tumbler {
model: 15
visibleItemCount: 5
anchors.centerIn: parent
}
}
Change-Id: I7774b7a59eb2e6c15299325780f13afbc220a374
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commits 150d8fcc7f97e4a5d56bdcf608fa22533d807677 and
0905066bcbb967d3344d399383d0ea4b30e1d489 that broke Tumbler. The
normalized position calculation did not work in some corner cases
(eg. when the total amount of model items is just 2). Therefore,
just go back to "displacement"; and if we ever get this working
correctly, we can call it position and deprecate displacement.
Task-number: QTBUG-53061
Change-Id: Ic721f8a96c250dd5d40f881ff991fae687311996
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I8b8d07a94f18b6f17faa3b0cdb2df2e038e4ca63
Task-number: QTBUG-50993
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
| |
Change-Id: Id47f3b938e4d2e6ce27fadc47d4aa7437f2bc085
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ifd44408b896343bdf77ea7b890360917944e2018
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Docs, resources, .metainfo and plugins.qmltypes will be updated in
follow up commits.
Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861
Task-number: QTBUG-52549
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>
|
|
|
|
|
|
| |
Change-Id: I8cfbd420cea4e01528d2f289cfc5989268d8718a
Task-number: QTBUG-43581
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>
|
|
|
|
|
| |
Change-Id: Ief9ee07d1f5f6c80500bfa611bace860481e2a3f
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
The original split existed because the public and enterprise
controls were developed separately. Now that all controls are
public and developed together, the split no longer makes sense
and is difficult for users to understand.
Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|