Commit Graph

2909 Commits

Author SHA1 Message Date
Mitch Curtis b12371c4bb Update README.md
Task-number: QTBUG-63651
Change-Id: I3781ebc1e10c1388dec42aea93f41235912ccebc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-22 12:47:54 +00:00
Oswald Buddenhagen 5ff4771a1c Bump version
Change-Id: Id414c990614ab9740aaac080d57e44f64c3dc53e
2017-12-20 12:06:34 +01:00
J-P Nurmi 40bb78270d Imagine: cleanup unnecessary property assignments
Change-Id: Iea84dc48b2807f336ff0b4c191fe5ec744cb1dd9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-12-20 09:07:13 +00:00
J-P Nurmi 7fb01dfe42 Fusion: cleanup unnecessary property assignments
Change-Id: I00abae64fd42e2d4a48e34adb341b1c897192fd3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-12-20 09:07:07 +00:00
Milla Pohjanheimo 6767d789b3 Add means to test binary compatibility and add the test file for 5.10
Added global.cfg file that lists the includes needed to create the
binary compatibility test file. Also added the binary compatibility file
to test 5.10 content.

Change-Id: I9ddf9000991452c63d491695fb30c5c27199164d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
2017-12-14 06:48:22 +00:00
J-P Nurmi 2940d8bfd1 Update plugins.qmltypes for styles
Change-Id: I19202b23a3027c7a24e15be2b929e9fc02aed044
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-12-13 16:04:13 +00:00
Mitch Curtis 09fc98fb56 Doc: link to Imagine examples from index and Imagine pages
Change-Id: I8dfe1ddca7d06553450bd3b7906a05e3530c3a85
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-13 08:20:04 +00:00
Joni Poikelin 3688d440ab Fix double toggling through Action with checked AbstractButton
Action caused checked state of the button to be reset back to its
original value if checked status had been change through click or key
press. To avoid this, separate private function has been added to that
does not change the status.

Task-number: QTBUG-65108
Change-Id: I8a5aaa9aab739db3ba10d0202f5fb718cc7195bd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-13 07:45:33 +00:00
Mitch Curtis 4371939807 Doc: mention qtquickcontrols2.conf file in font docs
Currently, there's no explicit mention of being able to customize the
font via the qtquickcontrols2.conf file.

Change-Id: I0c62e19b721a2d652021c303f876aaaa1098b880
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-11 15:27:31 +00:00
Mitch Curtis 3d3173ac3c Doc: mention qtquickcontrols2.conf file in palette docs
Currently, there's no explicit mention of being able to customize the
palette via the qtquickcontrols2.conf file.

Change-Id: I11f16a4e7dd759de2121e986df17ae9fdc651180
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-11 08:57:39 +00:00
Liang Qi eb7551d5d5 Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I0553212e943114e3fa592d9e1e9c1f7d59219186
2017-12-08 13:58:46 +01:00
Liang Qi 1265fef3b2 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Change-Id: Iacaf1656f2a66df0a97641f855aaf4d9d9189e6d
2017-11-21 10:59:33 +01:00
Oswald Buddenhagen fe4505386f Merge 5.10 into 5.10.0
Change-Id: I043c6f0484a3075db15687595026c0af76ba63ff
2017-11-20 13:49:15 +01:00
Liang Qi cbf8342526 Fix outdated FDL license header
Change-Id: I969a911c3e66aff502188ff9a103f16dc6544ba5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-11-16 08:08:16 +00:00
J-P Nurmi 44b1916367 QQuickIconLabel: fix alignment
QQuickIconLabel is a wrapper around QQuickText & QQuickImage. While
the alignment is mostly handled by layouting the internal QQuickText
and QQuickImage instances, it must also propagate the alignment so
that the text and image elements themselves also apply the correct
content alignment.

Task-number: QTBUG-64492
Change-Id: Ieb9d26fce703247bc6e2e61fa38e44c29937d1ad
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-15 19:52:56 +00:00
J-P Nurmi 25536bd436 Default: fix CheckDelegate
A regression introduced by 0504150. A wrong binding for the x-coordinate
was chosen while merging CheckIndicator back to CheckDelegate.

Task-number: QTBUG-64430
Change-Id: Ia3b07e7537cc888406076c700ecd495a958cb7c1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-15 19:52:49 +00:00
Liang Qi 558b3d09e2 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ide4b85626dd153b534c39a3afa2f3b9e732badf5
2017-11-15 09:11:04 +01:00
Antti Kokko 449b8ed252 Add changes file for Qt 5.10.0
Change-Id: I6ed929757a3d526b2c521359e744322e3f519250
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-12 16:55:11 +00:00
J-P Nurmi 2eb1d259c6 Update Quick Designer support
Add a lot of missing controls and properties.

Change-Id: I7c0ff3cc7fd7220e338d78cac575091ff12abf48
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-10 11:02:51 +00:00
Antti Kokko d92fdd989f Add changes file for Qt 5.9.3
Change-Id: Id3ab86fcc29b411e47b9930d3b1d4f313d7be91b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-09 05:31:40 +00:00
Konstantin Ritt a0559ea88b DialogButtonBox: micro optimization for resizeContent()
Change-Id: Ie72671fb92108dfaf5aaae4ea3ffb279e14b2f1a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-08 10:34:51 +00:00
J-P Nurmi f46776cc68 Fix QQuickSlider::valueAt()
Task-number: QTBUG-64065
Change-Id: Id77a85ce5b88c20795e9f7fe9d2ece974f46a315
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-07 08:33:50 +00:00
J-P Nurmi 442843db6f Update plugins.qmltypes
Change-Id: I792cd065a70aaabf2349e1fe2c5b5dc41e29d1d3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-06 15:01:46 +00:00
J-P Nurmi feab71f7e3 Update .gitignore
Change-Id: I696b405843f9eda79ec586cb99953469cb7f3c86
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-06 15:01:40 +00:00
J-P Nurmi f0f66c1aa0 Qt.labs.platform: declare and register enums to the meta system
To make them correctly available in QML so that they also work as
signal arguments.

Task-number: QTBUG-64259
Change-Id: I5fa00871f96357d924661c4b8af323a0f1748c9d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-06 14:26:29 +00:00
J-P Nurmi 8a56c3322f Re-order revision 3 members and add explanatory comments
We've come to realize that even though it's tempting to group similar
properties together, organizing the API so that revisions are grouped
together makes future maintenance more pleasant. It's a lot easier to
to see what was added and when.

The same was done for earlier revisions in 5.9 in commit 430fe83.

Change-Id: I738d7fdadd348c21737228c37d0f31e39b37f8e7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-06 14:15:04 +00:00
J-P Nurmi c39b126a77 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	src/quicktemplates2/qquickabstractbutton_p.h
	src/quicktemplates2/qquickbuttongroup_p.h
	src/quicktemplates2/qquickrangeslider.cpp
	src/quicktemplates2/qquickrangeslider_p.h
	src/quicktemplates2/qquickswipeview_p.h
	src/quicktemplates2/qquicktextarea.cpp
	src/quicktemplates2/qquicktextarea_p.h
	src/quicktemplates2/qquicktextfield_p.h

Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0
2017-11-06 14:02:21 +01:00
J-P Nurmi 430fe83ecb Re-order all revisioned members and add explanatory comments
We've come to realize that even though it's tempting to group similar
properties together, organizing the API so that revisions are grouped
together makes future maintenance more pleasant. It's a lot easier to
to see what was added and when.

Change-Id: I47ba7725260f2c259048848cc2a9b17bce2f01c7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-06 10:17:22 +00:00
J-P Nurmi 6470a54ed3 tst_scrollbar::test_overshoot(): use createTemporaryObject()
Change-Id: Ic98b332c5e30104c4a3c74a873caafa9065d6b5d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-03 15:17:28 +00:00
J-P Nurmi dc2603562a Fix DialogButtonBox revision 3
Change-Id: I63ce1220d39df62b47aa2168d3e358d4a006a638
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-03 14:55:50 +00:00
Mitch Curtis 830596edf2 Add Music Player Imagine style example
Change-Id: If285e90d25d497155c060907b8f8c60859e55a9a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-03 13:01:32 +00:00
Mitch Curtis 1eacc02282 Add Automotive Imagine style example
Change-Id: I7d7e49d0d4e1cbd61892215677c7ea0c5471af02
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-03 12:08:33 +00:00
Friedemann Kleint 508e5bcb6c Manual tests viewinqwidget: Fix build
The resource file gallery.qrc was removed, load from path instead.

Change-Id: I167c3f967f8a73bf0de9ffe1658c00970b3d8075
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-03 12:01:29 +00:00
Konstantin Ritt 18ce37852f DialogButtonBox: fix height calculation due to a trivial typo
Change-Id: I7bfb3505cf34b6e8a6f670abd81ee6e39084a1fc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-03 10:37:36 +00:00
J-P Nurmi fe6f52238a QQuickSlider: migitate value rounding errors
Task-number: QTBUG-64065
Change-Id: I7182cf24197250c927c8cc5227356e835e55a130
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-03 10:37:34 +00:00
J-P Nurmi a2d1f1ad14 QQuickTextField: retain selection on right mouse button click
QQuickTextField wants to emit pressed(), released(), and pressAndHold()
signals not only on left, but on all mouse button clicks. Therefore it
explicitly sets accepted mouse buttons to all. However, the base class,
QQuickTextInput, has only been prepared to handle left (selection) and
middle (paste) mouse buttons. Don't pass right mouse button -only
events to the base class to avoid it clearing selection on right click.

Task-number: QTBUG-64048
Change-Id: I015820c78995cc8dd7cbeb16fca0f9b991040bad
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-03 10:37:26 +00:00
J-P Nurmi fbb5e03106 Doc: mention the Side Panel example in Drawer's detailed description
Task-number: QTBUG-64099
Change-Id: I6580f1779e2863e25980968b076f342a5d76d423
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-03 08:07:54 +00:00
J-P Nurmi 757fac2872 Revert "QQuickTabBar: optimize layouting"
This reverts commit 80f6b146e6, because
the optimizations caused a binding loop on the TabBar page in the
Gallery example.

    qrc:/pages/TabBarPage.qml:90:13: QML TabBar:
        Binding loop detected for property "implicitHeight"

As a result, the tabs are looking broken at least when running with
the Imagine style.

Change-Id: I231bf5b21ecf92000bac94782567301214b64fec
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 14:48:07 +00:00
J-P Nurmi b882fae50e Improve tst_snippets
Make sure dynamically created QML components are destroyed when
going out of scope, and print out the error when creation fails.

Change-Id: Ie0ed785780cb861dd057adda8f4da399dd4986d2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 13:12:39 +00:00
J-P Nurmi 7ae5588980 Visualize mnemonics
Unfortunately this comes a bit late in the 5.10 cycle, but this should
be released together with the rest of the mnemonics stuff going out in
5.10, because it affects the value of AbstractButton/Menu(Bar)Item::text.
As the removed TODO comments and altered tests indicate, previously the
ampersand was blatantly stripped out. It would be worse to change it
later once people have already started using mnemonics and rely on the
behavior in custom styles.

The necessary modifications to QQuickText were added in qtdeclarative
commit 65ef4ba.

Task-number: QTBUG-61422
Change-Id: Iaa73da8c012e9a6019743cf98f5bdc02527064e5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 13:12:28 +00:00
J-P Nurmi 287411a392 Doc: update the MenuBar snippet to use ApplicationWindow::menuBar
The property was added in commit 19e7fb3.

Change-Id: Iae5e9f1076bc3312d78ffaf15027206ebd65046b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 13:12:16 +00:00
Mitch Curtis ba65be7a43 Imagine: round Slider handle position to avoid artefacts
The handle can be positioned "between" pixels, leading to unpleasant
results:

https://imgur.com/a/GKItw

Round the position to avoid this.

Doesn't seem to be an issue for other styles that use Qt Quick
primitives rather than images.

Change-Id: Iddb21e37ff777de433b3fa2a68e640db9a4b369a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-11-02 13:09:01 +00:00
J-P Nurmi c3481c3115 Optimize ProgressBar
Control's padding is supposed to be content padding, not background
padding. The background has a fixed height, so it's enough to set the
Y-coordinate to keep it vertically center aligned.

running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml
    [...]
    Average: 205.8  frames; using  samples; MedianAll=206; StdDev=1.30384, CoV=0.00633547

After:
    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml
    [...]
    Average: 214.4  frames; using  samples; MedianAll=214; StdDev=3.20936, CoV=0.014969

Change-Id: I4900bf496effa52e9291192e05ed95f4a44fbea4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 11:59:03 +00:00
J-P Nurmi f24a76bea9 Wearable Demo: make use of the icon support
Change-Id: I7a691f7b7c3d2f2a9f1d9a1ded29269184ddfcfe
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 11:58:50 +00:00
J-P Nurmi 05ba72454d Default: micro-optimize MenuItem
A binding to "<id>.<property>" is a tiny bit faster than a binding to
"parent.<property>". ID is a direct reference, like a pointer in C++,
whereas "parent" is a property so the binding is effectively depending
on two properties: "<property>.<property>".

The gain is not huge, but enough to show up in qmlbench. ;)

Before:
    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml
        [...] (10 repeats, all results between 65-66)
        Average: 65.5  frames; using  samples; MedianAll=66; StdDev=0.527046, CoV=0.00804651

After:
    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml
        [...] (10 repeats, all results between 66-67)
        Average: 66.6  frames; using  samples; MedianAll=67; StdDev=0.516398, CoV=0.00775372

Change-Id: Ib161fad3b11e19a4bb0f39900639131f36838d2a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 09:12:30 +00:00
J-P Nurmi 02c44ee007 Default: merge SwitchIndicator back to Switch & SwitchDelegate
See the previous commit (CheckIndicator) for more details.

Before:

    running: /home/jpnurmi/Projects/qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
        [...]
        Average: 87.8  frames; using  samples; MedianAll=87; StdDev=2.16795, CoV=0.0246919

After:

    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
        [...]
        Average: 92.6  frames; using  samples; MedianAll=92; StdDev=2.19089, CoV=0.0236597

Change-Id: Iea9e88e4e771ac27d336c2c87232704d33a226ec
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 09:12:22 +00:00
J-P Nurmi 1350b91aaf Default: merge RadioIndicator back to RadioButton & RadioDelegate
See the previous commit (CheckIndicator) for more details.

Before:

    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml
        [...]
        Average: 91.6  frames; using  samples; MedianAll=91; StdDev=1.51658, CoV=0.0165565

After:

    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml
        [...]
        Average: 95.8  frames; using  samples; MedianAll=96; StdDev=2.04939, CoV=0.0213924

Change-Id: Ic185241767d0b9422e86919356e3155e00803e56
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 09:12:18 +00:00
J-P Nurmi 0504150e4a Default: merge CheckIndicator back to CheckBox & CheckDelegate
The internal CheckIndicator helper was introduced together with
CheckDelegate in 1acb34a, because we naturally wanted to share the
indicator instead of duplicating it. This change is controversial,
because it leads to duplicate code, but keeping the indicator
definitions inline is clearly faster. This is not seen as a huge
problem for the Default style, because the indicator is not too
complicated. Basically, this fixes a ~5% performance regression
introduced by 1acb34a.

Before:

    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml
        [...]
        Average: 72.8  frames; using  samples; MedianAll=73; StdDev=1.48324, CoV=0.0203742

After:

    running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml
        [...]
        Average: 77  frames; using  samples; MedianAll=77; StdDev=1.41421, CoV=0.0183664

Change-Id: Ibee0e29e83a64ee4a6a772a90b1784a9c8c715bb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 09:12:14 +00:00
J-P Nurmi 6f89cf6370 Optimize QQuickTumbler
Listen to the relevant view changes once in QQuickTumbler and cache
the offset/contentY instead of every QQuickTumblerAttached instance
doing its own geometry and child tracking, and cache the view offset
or contentY so that they are readily available while calculating
displacements for attached property objects.

This gives a 5% boost (40->42 frames in qmlbench) on TX1 in release
mode.

Change-Id: If1a77468e812e65bc07f32216ff9bf2e1dc5b935
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 08:33:30 +00:00
J-P Nurmi e02ebcdb0b Optimize CheckBox, Switch, and RadioButton
Add an internal CheckLabel helper that simply initializes a few
QQuickText properties with defaults that are suitable for CheckBox,
Switch, and RadioButton. This gives a 10% boost on desktop in debug
mode, and a 5% boost on a TX1 in release mode.

Change-Id: I82fead9ca22b6aa74f24924d240c924b2a42a912
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-11-02 08:33:17 +00:00