| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add new QtQuick.Effects plugin for post-processing effects.
The plan is to add essential effects directly into QtQuick,
not to duplicate Qt Graphical Effects.
Initially the plugin will contain MultiEffect which supports
7 different effects in a single ShaderEffect (brightness,
contrast, saturation, colorize, blur, shadow, mask). Combining
multiple effects into a single shader is more performant than
chaining multiple effect items. Depending on used features,
the most optimal shader gets selected.
Includes two examples demonstrating the usage of MultiEffect.
Task-number: QTBUG-106651
Change-Id: I35865030fd4b7a1f657146cee03b195451545bc6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Work on this was already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.
The CMake target (docs_QuickControls2) probably can't be renamed
until we rename the library, which won't happen until Qt 7.
Task-number: QTBUG-95413
Change-Id: Ied20805a91286436606577c3de39671a447f27dd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.
By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.
This patch does the following:
- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.
A follow-up patch will handle documentation.
It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.
Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Running qmllint on extending-qml examples raises a plenty of warnings
due to a missing dependency declaration to QtQuick. Simply add it. Also
add FINAL to all properties exposed from C++ to disable (possible) property
shadowings.
Pick-to: 6.4 6.2
Fixes: QTBUG-106602
Change-Id: I7b12a804f8f3ca64bd8f2f312a9e53dfe02b0a4c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
| |
Clearly nobody has run this in recent history.
Change-Id: I77aa8acc1de1346ded034ccd47682afaba2efe2b
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
|
|
|
|
|
|
|
|
|
| |
Add an example to demonstrate RHI rendering in the scenegraph with a
custom QSGRenderNode. Works for Vulkan/OpenGL/Metal/D3D rendering
directly, and into a layer.
Change-Id: I0333f63fd729312b71e51f5b6376e46f8afe1fe6
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GameOfLifeModel is a QAIM, but qmllint does not know what QAIM is by
default. Make it aware of it by explicitly depending on QtQml.Models.
Then fix the Layout related warnings found by the Quick lint plugin:
- remove the superfluous x and y values in the slider,
- and remove the empty padding Item in lieu of setting
Layout.rightMargin on the Button to achieve the same effect.
Change-Id: I2ef6f9a1ffa276b66415ce3374eb41c34d8673b6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
|
|
|
|
|
|
| |
Amends 49b9f1f1e85.
Change-Id: If08e3e2b20d12e444c304c40fba23990fa5e2112
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We weren't really supporting an attached API for the iOS style,
even though QQuickIOSStyle was a QQuickAttachedObject.
The QQuickIOSStyle had two properties: theme and url. We were using
the read-only IOS.theme property to select the source for the assets
based on the theme (light/dark), but this is not needed anymore as
we are now using the new Qt.styleHints.appearance property instead.
The url property was also not configurable and the controls
implementations were using it to access the path of the image assets.
As both of these properties were not settable and propagatable, and
we don't intend to make them as such, it doesn't make sense to have an
attached API for this. So make the QQuickIOSStyle a QObject and a
singleton. Remove the theme property.
Since the API doesn't need to be public, move it to the private
iOS.impl module.
Change-Id: I197aadba2032a30d97a3d9a6698b74aa8709b6f9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
Pick-to: 6.2 6.4
Fixes: QTBUG-103939
Change-Id: I60237f8cc58ebb6781a4df272fb7da13467d6640
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rectangle's parent was null when setting
left and right anchors. Use
pragma ComponentBehavior: Bound and
required properties instead.
Pick-to: 6.4
Fixes: QTBUG-106645
Change-Id: Ie5b8c3a20948799363fad1332113884612d18968
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If exclusiveSignals == NotExclusive (the default), behavior remains as
it was: singleTapped() and doubleTapped() are emitted as the taps occur,
so it's not very useful to react on singleTapped() if you mean to
distinguish these two cases.
If exclusiveSignals == SingleTap, the doubleTapped signal will not be
emitted at all, and therefore singleTapped can be emitted immediately
and unambiguously.
If exclusiveSignals == DoubleTap, the singleTapped signal will not be
emitted at all, and therefore doubleTapped can be emitted immediately
and unambiguously.
If exclusiveSignals == SingleTap | DoubleTap, we must wait
qApp->styleHints()->mouseDoubleClickInterval() milliseconds after a tap
is detected before emitting either signal, so that they are distinct and
can be used to drive behavior that should not occur in other cases.
A triple-tap will not trigger either signal.
[ChangeLog][QtQuick][Event Handlers] TapHandler.exclusiveSignals now
lets you make the singleTapped and doubleTapped signals exclusive.
Task-number: QTBUG-65088
Fixes: QTBUG-107264
Change-Id: Ifb2c4b72759246c64b3bfa2f776c28266806b985
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Use Qt::StringLiterals::_s instead.
Also reflow lines because stricter /Zc options coming in from a
qtbase update make MSVS barf on line-broken u"" ""_s expressions.
Change-Id: I95a2a3d878d2ac506d9c54bbdeb734cf5d94bb8b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This type has been used internally as QQuickAttachedObject by the
Imagine, Material and Universal styles to enable propagation of colors,
dark mode flags, etc. for a while now. Users would benefit from having
access to it to create their own styles (although it's not just limited
to that use case).
This patch:
- Makes the type public in quickcontrols2.
- Adds documentation and an example.
- Fixes the test_window test to ensure that propagation through child
windows actually works.
[ChangeLog][Controls] Added QQuickAttachedPropertyPropagator, which
provides a way to propagate attached properties from parent objects
to children. This is especially useful when creating your own style.
Fixes: QTBUG-63267
Change-Id: I2f1794dc4a9f2be56fad2f5e5f39e2ab845157fa
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently, it's rather hard to find the documentation on how to write
attached properties. The page that gets found first in most search
engines seems to be the example - so link from it to the actual
documentation pages.
Pick-to: 6.2 6.4
Change-Id: I78c9949d62863b5c11ffcd97413084ab03b0bc33
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Move Settings from the Qt.labs module to the QtCore module.
And deprecate the original one in Qt.labs.
Also changed the fileName(QString) property to location(QUrl)
to better fit the Qt API.
Adjust the tests accordingly.
Task-number: QTBUG-92806
Change-Id: I1cbad1315383a9f2963583fd4d00cf3612f99f1e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-98130
Pick-to: 6.2 6.4
Change-Id: I18e45ab63e0cab8611b4274e2d312db12fc9775d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
qt_add_qml_module() should be used instead of qt_add_resources() for
adding resources to examples in qtdeclarative.
Task-number: QTBUG-98130
Pick-to: 6.2 6.4
Change-Id: I41adae7f861f6cbcc13a735a43e8b5dd3ec31934
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We want to use qt_add_qml_module() instead of qt_add_resources().
Note that this change also changes the target to 'galleryexample', which
will also affect the name of the executable. I'm making that change in
order to be consistent with other examples.
Task-number: QTBUG-98130
Pick-to: 6.4 6.3 6.2
Change-Id: I1ed1af18a01b652673828c60e803cb2ea9b04a3d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This patch also includes a small change to a signal handler,
in order to avoid a warning message.
Task-number: QTBUG-98130
Pick-to: 6.2 6.4
Change-Id: I2df71f397a4a8cb43912b90c0c89b297f5463568
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This patch replaces the usage of qt_add_resources() with
qt_add_qml_module()
Task-number: QTBUG-98130
Pick-to: 6.4 6.2
Change-Id: I31ef1bd0c725fe741c8505fa1620801195e46eeb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
| |
Our examples should use qt_add_qml_module when possible.
Task-number: QTBUG-98130
Pick-to: 6.2 6.4
Change-Id: I9f5946bf287734aab52c08691d6e38910de0e410
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
We want our examples to use qt_add_qml_module(), since it has a lot of
advantage over the old method of using qt6_add_resources().
Task-number: QTBUG-98130
Pick-to: 6.2 6.4
Change-Id: I124863e50a9cf201981ea073d5b2096d511271a4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-98130
Pick-to: 6.2 6.4
Change-Id: Ib1eeaf1f837e10eaf88b0e64d792466db8b4f151
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Chat Tutorial application was not able to find main.qml file when using
qmake. It was caused by cmake adaptation for using qt_add_qml_module.
The main.qml file is currently searched in the chapter directory.
To these changes also qmake configuration must be adapted.
Pick-to: 6.4 6.3 6.2
Fixes: QTCREATORBUG-27655
Change-Id: I1e92d806dbfeb17e613596f96fd24f53fb6eba1d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Amend ec582ef0b9e31c5e8fb9d36a17f1e39f593d7455 which removed use of Material
as the default style. This cause example to fail when cross-compiled, as it
then used different qml file which had dependency to Material style.
Fixes: QTBUG-106557
Pick-to: 6.4 6.3 6.2
Change-Id: I7f918363a47c801a6755eca38c1c4bc4da2854b6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
- Hide keyboard on Keys.onReturnPressed event in the TextField-s
- Add "Done" button to TextArea to mark editing as finished and hide
the keyboard in return
Done-with: Mitch Curtis <mitch.curtis@qt.io>
Pick-to: 6.4
Change-Id: I3351e5b3db356946b59b19c6f424153cbf2dbbb1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I03afea816e6935af7f32f38caf736f60e351d87a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The "\page" command for QDoc, used to construct a standalone
documentation page in the output documentation of a project, was able to
take a second argument, apart from the first argument representing the
name for the generated documentation page, that roughly represented the
type of the page that was to be generated.
This second argument was not actually used by QDoc, such that it had no
meaningful effect.
QDoc was recently modified to not support this second argument,
internally, and officially removed its use.
For technical legacy reason, QDoc will still support the usage of a
second argument for a "\page" command, albeit it will do nothing, as
before.
To avoid confusion for future readers who might not be aware of the
history of the "\page" argument and that will not find an explanation in
QDoc's documentation anymore, the usages of the second argument in
"\page" commands are now removed.
Change-Id: I0241ffa17d658245516f725e64048e332cbccd42
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QQuickItemLayer now has a live property that can be set to determine if
its contents should change whenever the item updates. This enables
variable refresh rate for quick items.
[ChangeLog] Added live property to QQuickItem layer.
Fixes: QTBUG-77343
Change-Id: I8bf7e7af4cfed6deef2253d346bb0b72d0fef66e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-80261
Pick-to: 6.4.0 6.4
Change-Id: Ie6d86b0a49bd0684373816d709c7e010aff7e7a5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-105718
Change-Id: Id89ed14990804a5024183e75382cc539d4293da1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.4
Change-Id: I1f4d4920bb9d132a846ac2dbcfdb8b660759d540
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The qtquickcontrols2.conf file was hard coding the style to be
Material. In addition, it was overriding both the Primary and the
Foreground color, and sat Theme=System. The latter meant that the
application would run in either Light or Dark mode, depending on
the OS. And for Dark mode, the assigned colors caused the text to
end up with the same color as the background color, and therefore
be invisible.
The same with the toolbar buttons; since the icon color of a toolbar
button map to the primary color, and the primary color was hard-coded
to be the same as the background color in the configuration file, the
buttons would appear hidden.
Since we now have native styles for both macOS and Windows (and
Fusion on Linux), overriding the style (and especially the colors)
in a config file seems unnecessary.
This patch will therefore remove the whole config file, and use
the default style settings instead.
Fixes: QTBUG-105860
Pick-to: 6.4 6.3 6.2
Change-Id: I330fe30746096cf26d8dca343f2c122d7c32c7fe
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
| |
We need to deploy qmldir to make the example work also for remote targets.
Pick-to: 6.4 6.3 6.2
Change-Id: Id0b7bf4a48bd163ddf5e44a5a68ca3edbbcc008e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In 6.4 we're introducing the ColorDialog in the qt quick dialogs module.
This was the final dialog, that was missing from the module in previous
versions of qt.
This change will make use of the new dialog, instead of the qt labs
platform version, which is using the widgets color dialog as a fallback.
The eventual goal for this example should be to eliminate the need for
the qt labs platform module entirely.
Note that I am also making a small change to how the font dialog is
being used, since we deprecated the currentFont property in the 6.3
release, but I forgot to update this example along with it.
Pick-to: 6.4
Change-Id: Ib99ca7cbf110d3084ff96dfadfa1cd8c8af8815e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
| |
The property should be selectedFile, not file.
Pick-to: 6.3 6.4
Change-Id: I3ce399a7df2d80d122058c411b9b1a633f04fc64
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Use correct image in documentation for eventcalendar example.
Pick-to: 6.4 6.3
Fixes: QTBUG-105572
Change-Id: If217dfa536aea2fa3197510c36a865053e3e96dd
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
The paths need to be the same between CMake and qmake and you really
should not use absolute qrc paths.
Amends commit d270c51f812b5f0ffe6208b38c8ea0e898535e50
Amends commit e0ee63a06eeef2d6325a5cbf1a29bd11e5d7ac29
Change-Id: I9f6d3ac3fbf4483e0c0f2cad540f45c25192886e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Stuff cannot just magically move under a different prefix
when shaders are referenced with relative paths.
As the example uses the common main helper code, it is
easier to switch to absolute paths than to use
NO_RESOURCE_TARGET_PATH.
Amends d270c51f812b5f0ffe6208b38c8ea0e898535e50
Change-Id: I527314725210e02675dc8c2f5fc5042dc5e1c478
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
|
|
|
|
| |
Amends d270c51f812b5f0ffe6208b38c8ea0e898535e50
Change-Id: I616850c04facbcd7662c479d34b1a3f0a7220556
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.
Existing copyright statements remain intact
Task-number: QTBUG-88621
Change-Id: I72c89a98c42bbc9234d8495e9e503bec81d11037
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Examples that don't explicitly set NO_RESOURCE_TARGET_PATH get the
AUTO_RESOURCE_PREFIX now.
Task-number: QTBUG-103452
Change-Id: I6b41e96ce5620079f60ca2f967b0a2e611c1f738
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
Files that have to be modified by hand are modified.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
| |
It's generally a good idea to state the headers. Let's teach our users
to do so.
Change-Id: I50b81d6724bce1f7e5aa6ed4491fcc63e21a0247
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
|
|
|
|
|
| |
Change-Id: I6452ba667078cb8ad5dbf9cc8c6512c8dea9f933
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.3
Change-Id: Ifec0960bfb3f179e2cf5ff5e7f11364b106a86e3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The header file has two snippets with the same id. Rename to unique
values and link to the correct snippet id from the qdoc file.
Fixes: QTWEBSITE-1051
Pick-to: 6.3
Change-Id: I9003916f831898026f520fd86d60ab1c0230e6c4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
| |
It shouldn't be "dynamicscene" as that URI is already used by a
different example.
Change-Id: I35ac6b7ea70703f24304f640252f922d6a5b2371
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Our goal is to eventually remove the dependency for the qt labs platform
module. This patch will replace one of the labs platform MessageDialogs,
with a MessageDialog from qt quick dialogs.
All of the dialogs that are used in this example will eventually be from
the qt quick dialogs module.
Change-Id: I19f97948bf04d0fa5b265e057bbf49374bb51472
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|