| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/controls/Private/qquickrangemodel.cpp
src/controls/Private/qquickrangemodel_p.h
src/controls/Private/qquickrangemodel_p_p.h
src/layouts/qquicklayout.cpp
tests/auto/controls/data/tst_rangemodel.qml
Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
__handlePos (badly named; it should be, e.g. __handleValueForPos)
represents the value of the handle based on "fakeHandle"'s position. It
is the result of range.valueForPosition() being called. However, the
arguments to this function (fakeHandle.x and fakeHandle.y) don't always
change when the values of the slider change, which leads to the x
calculation for the handle delegate in SliderStyle having outdated
information, causing the related bug.
The fix for another bug already works around this issue by passing the
relevant properties as arguments (which are ignored) to the function
call. This is presumably done this way because it should be cheaper
than forcing the JavaScript engine to evaluate a more clearly written
expression where each related property is on its own line, for example.
property real __handlePos: {
range.positionAtMinimum, range.positionAtMaximum;
return range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y);
}
In the case of the related bug, minimumValue has been updated, but
__handlePos is still using the old value, causing the handle to be
positioned incorrectly. So, we continue this tradition and add another
property to the list of arguments.
Task-number: QTBUG-51765
Change-Id: I40882872e668a867a8f5e5768244e199618bd769
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I625e7d3e4b5003105587769edb8fc68747ceac35
Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Specifying width and height is typically a bad idea, as they can be
overridden by the layouting engine. implicitWidth and implicitHeight
are better.
Change-Id: Ib597f1fa98f82f00236c79bb5f9f07405593c35e
Task-number: QTBUG-51842
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
It's not exactly clear from the documentation.
Change-Id: If173c63e080709c13b4a7b0bf18ef9b02eeec474
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Prevent extra value changed signal to be fired in case when Slider with
minimum > 0 and value > minimum are set.
Change-Id: I86824c403a7c0296f782d2eec7ed30acfc13b304
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After b4c1391, QML files does no longer show up in QtCreator for
static builds. Before they would show as resources, but since
we now only create resources explicit for dynamic builds (and implicit
otherwise), QtCreator cannot see them.
This patch will add all the qml files as OTHER_FILES when doing static
builds, so they show up in QtCreator.
Change-Id: I8ee7d53e938cd96da23b0dc0ca78406449e3504d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Property binding for row property in styleData causes an update which
tries to read new value for the index property, but index is changed
afterwards which causes old value to be read. This may lead to crashes
and other unwanted behavior.
Depth changes are now delivered to update item depths in visible
items and model index changes though role instead of looking for a row
change.
Task-number: QTBUG-47523
Change-Id: I540cd06a25281f18e4628f4b030cf969dc8e0a7f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the parent window gets destroyed while a QtQuick Controls menu is open
the macOS native platform menu is not dismissed and you see a blank
gray rectangle without any text.
Also, at this point the QQmlEngine was already destroyed but it's still
present on the call stack, so you get a crash when the stack unwinds to
the original right mouse click that created the context menu.
Change-Id: I638b0de13734815995d2994e6dd6603bcb0ebefc
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I6242fa1ab805d13753678feb5929da67ae0f4385
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ibd33614206e8d770bd7ee0888a8806662e3a1a73
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If scroll indicator is at the beginning and data prepended to
contentItem, scroll indicator should change position to previous content
beginning.
This is especially important with so-called "infinite scrolling", when
scrolling goes upwards and new content added at the top of the view.
Task-number: QTBUG-50795
Change-Id: I250d6535b1146a54c6a70062b659cc49ed43709f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As of version 10.12 (Sierra), the name of Apple's desktop operating
system will be macOS. Change all occurrences where the platform is
discussed to use the macro \macos (defined in the documentation
configuration in qtbase).
Change-Id: I5ca47e4d830c12df297ee298ed22fd2d41dee739
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Closing a window while a popup is open should not trigger an activation event
when the popup is closed.
Prevents QGuiApplicationPrivate::focus_window from being changed to a stale window,
which happens inside QGuiApplicationPrivate::processActivatedEvent().
Change-Id: I3145b3d191abb20d56fa9acbec8a0776a6bf8526
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/controls/doc/src/qtquickcontrols-examples.qdoc:90: warning: Unable to parse QML snippet: "Expected token `{'" at line 1, column 10
src/controls/doc/src/qtquickcontrols-examples.qdoc:116: warning: Unable to parse QML snippet: "Expected a qualified name id" at line 1, column 1
src/controls/doc/src/qtquickcontrols-tableview.qdoc:299: warning: Unrecognizable QML module/component qualifier for TableView::section
src/controls/doc/src/qtquickcontrols-treeview.qdoc:138: warning: Unrecognizable QML module/component qualifier for TreeView::section
(multiple) warning: Can't link to 'DropShadow'
Change-Id: Ic5e2dcbe9810486290e164f561ecba969f57df78
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changing the contentHeight might change the maximum value of the
scrollbar which might change the value of the scrollbar which, if
blockUpdates is not set, will change the contentY of the flickable.
This can cause flickering when contentHeight varries with contentY
which might typically happen for a ListView where not all elements
have the same height. Or worse, this can make the scrolling jump
and result in the wrong position.
Change-Id: I1968055492d679387ebbf6813a160efbf82e4fbb
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Error message:
Cannot find 'QQuickRangeModel::minimumValue' specified with '\property'
for several properties
Change-Id: I82bf7a277da27b096e15aac223612b96fcddadc4
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes the very frequent warning from plasmashell:
WARNING: Cannot find style "Plasma"
Change-Id: Ibe853e7b8b42adc2bce7c63a1505b27898ea5ffc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The unittest was showing that it was looking in
<CURRENTDIR>/qrc:/qt-project.org/imports/QtQuick/Controls/Styles
which makes no sense.
In addition, the code was only listing the directory where
the default style is found. When the custom style is elsewhere,
it needs to be looked up in addition.
Change-Id: I93eddab73672c575cd92037e1d0b366cf17540ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Corrected link issue with DropShadow in PieBoxStyle.qml
Change-Id: I66821c69f392b016a0ea1a699a26990d7aad5140
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
These are not strictly necessary as they are for internal types,
but it makes it easier for QDoc to resolve the type inheritance.
Change-Id: If4a2650fab5251081ae74b109bfb97220c25751c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7.
The incorrect \inherits commands caused property documentation
from base types go missing.
Task-number: QTBUG-54150
Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I3704fd913d26646d8ecdf2a81680d66e8960704c
Task-number: QTBUG-54192
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-53529
Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
|
| |
| |
| |
| |
| |
| |
| |
| | |
Examples in binary packages now directly match the install path.
Change-Id: Icd9ae9ef887b99b96177ec7b590fc3f35da18c82
Task-number: QTBUG-52953
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Unfortunately the destructor of QStyleOption is not virtual so
you need to cast them all individually otherwise the wrong destructor is called
Change-Id: I3b07450438d98910fbbff9f81234876551ed4e5d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of instantiating a SystemPalette object for every Label, re-use
the singleton, which is already designed for this.
Change-Id: I7356fc983ea6dcd4dad0207c41ae1e0ba07dace4
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
|
| |
| |
| |
| |
| |
| |
| |
| | |
Use the pre-defined macro.
Change-Id: I52e362672ff719202d3e40e4245baac2af29f624
Task-number: QTBUG-53208
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It's needed for Android devices that have not touch screen,
e.g STB.
QTBUG-36007 is already resolved and we can use QTouchDevice::devices()
Task-number: QTBUG-36007
Task-number: QTBUG-53095
Change-Id: Iaab89cc75238d1aba83ce3d79f3c29fb5cab172f
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ApplicationWindow.qml makes use of QtQuick.Layouts. For
that reason we need to inform qmake about the dependency
so that it links it in for static builds.
Change-Id: I30022a3329bc4adca5ca856bc37e72bb157894cd
Task-number: QTBUG-52652
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
this includes renaming the first-level subdir of examples/.
Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: If6a3ebfdea652437522d3a22e0399818d887b3d5
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The minimumValueAngle and maximumValueAngle variables it mentions are
private.
Change-Id: Ib95c96aeb218c8624857c212429f6c4e4e77ece2
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix qdoc-warning:
qtquickcontrols/src/controls/doc/qtquickcontrols.qdocconf:50: warning: Cannot find file or directory: ../Private/qquickabstractstyle.h
/
Change-Id: If4548ebc2a33a42fd756f8a67d83e64c8dc8d638
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I63e4e2b807e7b222a589a5e03d510acfe1d97511
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Until we have a better API in place for checking if
a platform should select text with mouse or not, just
disable it for now on iOS.
Change-Id: Iabe64554dd1d8bb1deb6f232ef59e07ef1398b3f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I4d8cf26272767a82c89cc1119afecfe1a0fedabd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Text selection and overlay are now done from the
iOS platform plugin.
Change-Id: I3903ab05816775f75708e915780f549e62797135
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Takes priority over QT_QUICK_CONTROLS_STYLE to allow specifying system
wide style name preferences separately for Qt Quick Controls 1 and 2.
[ChangeLog][Controls] Added support for a QT_QUICK_CONTROLS_1_STYLE
environment variable, which takes priority over the existing variable
QT_QUICK_CONTROLS_STYLE. This allows specifying system wide style name
preferences separately for Qt Quick Controls 1 and 2.
Change-Id: I0e40c2790c24b7ef66b1995b8337e573bb2f75a2
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Amends change 1c5f765658432a08ed52523c3a4547ab2b4a58f1, fixing
qdoc-warnings:
../qtquickcontrols/src/controls/doc/src/qtquickcontrols-examples.qdoc:127: warning: Cannot find file 'basiclayouts/basiclayouts.pro' or 'basiclayouts/basiclayouts.qmlproject'
../qtquickcontrols/src/controls/doc/src/qtquickcontrols-examples.qdoc:127: warning: EXAMPLE PATH DOES NOT EXIST: basiclayouts
Change-Id: I0bacabb2b611bfb0095ae216532bcc490747d092
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
|
|\ \
| |/
| |
| | |
Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
|
| |
| |
| |
| |
| |
| |
| |
| | |
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce -force
Change-Id: I88acc450a8af929b011286d2ba2f81e75ed0faa9
Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
And switch to use \qml instead of \code, as the snippet is valid QML.
Change-Id: I0680eb0427fd3537ab052bb20ce5d7468545ccb0
Task-number: QTBUG-51715
Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-50841
Change-Id: I189745968f9821e324ac25ed64a824bc8eaa9b23
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I53d43d03216425e7493e7381ea31f1dfbf553d58
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
At least it is not documented anywhere how to set
the validator for the SpinBox control.
Change-Id: I6d31608306298d601a0f91f6b14d71f6775a5792
Task-number: QTBUG-51723
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|