qt/qtdeclarative.git/examples, branch 6.7.3 Qt Declarative (Quick 2) Doc: Fix qsTr() link 2024-07-19T16:39:31+00:00 Andreas Eliasson andreas.eliasson@qt.io 2024-06-26T13:04:19+00:00 b94399934233c64b60b038f65fff2514b9ee609a Fixes qdoc warning: qtquickcontrols-texteditor.qdoc:128: Can't link to 'qsTr' Change-Id: Ib2543779cc97052fd754b417468cb315313503a9 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit a7bd27f17d512a7ca1d928cbf9030cd6598086f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ac58ea00a99c74f17ccd4f14f93eef5c569a3931) 
Fixes qdoc warning:
qtquickcontrols-texteditor.qdoc:128: Can't link to 'qsTr'

Change-Id: Ib2543779cc97052fd754b417468cb315313503a9
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
(cherry picked from commit a7bd27f17d512a7ca1d928cbf9030cd6598086f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit ac58ea00a99c74f17ccd4f14f93eef5c569a3931)
graph example: Do not use GLSL functions as uniform names 2024-05-29T15:03:20+00:00 Laszlo Agocs laszlo.agocs@qt.io 2024-05-24T09:51:33+00:00 19461382758c177376ccde23dcce8ba5b2b8bfe5 Using textureSize in the uniform block leads to renaming it to _textureSize when transpiling to GLSL. This is not reflected in the reflection metadata for some reason. For OpenGL this matters because the QRhi backend won't be correctly able to set up the uniforms when the names do not match. To overcome this, use a name in the shader that does not conflict with a built-in GLSL function. Strictly speaking the name (textureSize) is somewhat incorrect anyway. Use texCoordScale to express its meaning better. Pick-to: 6.6 6.5 6.2 Change-Id: I863e98c6d56cc46fad895763b9b5106a40e2952c Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 3d8c86976844bc9507b0ff677188eee64e49b732) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Using textureSize in the uniform block leads to renaming it
to _textureSize when transpiling to GLSL. This is not
reflected in the reflection metadata for some reason.
For OpenGL this matters because the QRhi backend won't
be correctly able to set up the uniforms when the
names do not match. To overcome this, use a name
in the shader that does not conflict with a built-in
GLSL function. Strictly speaking the name (textureSize)
is somewhat incorrect anyway. Use texCoordScale to
express its meaning better.

Pick-to: 6.6 6.5 6.2
Change-Id: I863e98c6d56cc46fad895763b9b5106a40e2952c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 3d8c86976844bc9507b0ff677188eee64e49b732)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Adds documentation for the qml_in_kotlin_based_android_projects example 2024-05-06T06:01:45+00:00 Konsta Alajärvi konsta.alajarvi@qt.io 2024-04-22T07:21:21+00:00 78b3de1019aa2206491911d7af480a640a8ddaac Documented the qml_in_kotlin_based_android_projects example in the same .qdoc file as the qml_in_java_based_projects example. Added snippets tags to MainActivity.kt. Added support for code snippets from .kt files in qtquick.qdocconf. Fixes: QTBUG-123423 Change-Id: I5ac4d231bf77a23b4083ca26712949d66c2483c1 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit 947986009dd13ff2992c1f91b369493037fb1463) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Documented the qml_in_kotlin_based_android_projects example in the
same .qdoc file as the qml_in_java_based_projects example.

Added snippets tags to MainActivity.kt.

Added support for code snippets from .kt files in qtquick.qdocconf.

Fixes: QTBUG-123423
Change-Id: I5ac4d231bf77a23b4083ca26712949d66c2483c1
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
(cherry picked from commit 947986009dd13ff2992c1f91b369493037fb1463)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Add example showcasing embedding QML to native Android Kotlin project 2024-05-02T14:15:33+00:00 Konsta Alajärvi konsta.alajarvi@qt.io 2024-03-21T12:30:49+00:00 09248dcfef26a2688994b50cd6f88f07fd6828f9 Add new project folder qml_in_kotlin_based_android_project which include the new Android Studio project. Fixes: QTBUG-120717 Change-Id: I53023c897c92d275018b4e40ab84a3b60e0afa1f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit e8060eac72e9c37cba5720e934dc1d4d6ed9b81a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Add new project folder qml_in_kotlin_based_android_project which
include the new Android Studio project.

Fixes: QTBUG-120717
Change-Id: I53023c897c92d275018b4e40ab84a3b60e0afa1f
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e8060eac72e9c37cba5720e934dc1d4d6ed9b81a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Doc: Fix mentioning of QQW::createTextureFromNativeObject in example 2024-04-19T18:33:32+00:00 Kai Köhne kai.koehne@qt.io 2024-04-19T10:32:37+00:00 688874e1cd0d784ee7f8c1cada5b7c0eb3616265 The method got removed in Qt 6.0, and the example code was adjusted accordingly (commit fb96109bbc2ec5d). While at it, also remove the mentioning of the even older QQuickWindow::createTextureFromId(), as that is most likely not relevant for new users looking into this example. Pick-to: 6.6 Change-Id: I2ea3fcf3de78e13afec9e2b25aa8d4a6a9a9b571 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 79c3fb123d166f1eb355e064ee6cc6aca0e4749a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
The method got removed in Qt 6.0, and the example code was adjusted
accordingly (commit fb96109bbc2ec5d).

While at it, also remove the mentioning of the even older
QQuickWindow::createTextureFromId(), as that is most likely
not relevant for new users looking into this example.

Pick-to: 6.6
Change-Id: I2ea3fcf3de78e13afec9e2b25aa8d4a6a9a9b571
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 79c3fb123d166f1eb355e064ee6cc6aca0e4749a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Adds documentation for the qml_in_java_based_android_projects example 2024-04-17T01:38:51+00:00 Nicholas Bennett nicholas.bennett@qt.io 2024-03-01T19:48:59+00:00 5b386f4735da43a31c7f73779b7f5f1b8fa217a6 Added a qdoc file to the top folder and edited the qtquick.qdocconf file to include it as src and for snippets. Task-number: QTBUG-122964 Change-Id: I581e369b0682804729a98288164492ac1c604194 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 0b594fb3ba2d6b8ac80ec6f09744866a2abe80df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Added a qdoc file to the top folder and edited the qtquick.qdocconf
file to include it as src and for snippets.

Task-number: QTBUG-122964
Change-Id: I581e369b0682804729a98288164492ac1c604194
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 0b594fb3ba2d6b8ac80ec6f09744866a2abe80df)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Fix contactlist example not finding ContactList type on macOS 2024-04-15T04:00:01+00:00 Mitch Curtis mitch.curtis@qt.io 2024-04-04T04:59:03+00:00 b586c4914de1b59743dbcc4dc8ffa974420582e7 ec9312687e36ac06faaf4d4cdbd2528cc297a849 added NO_RESOURCE_TARGET_PATH, which causes issues on macOS. Fixes: QTBUG-123773 Pick-to: 6.5 Change-Id: I80f4cb740dde47549e4357f08b6ae00c243b77b5 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 85ea1653dbdcd0f321746e6f4281c33e84d264af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
ec9312687e36ac06faaf4d4cdbd2528cc297a849 added
NO_RESOURCE_TARGET_PATH, which causes issues on macOS.

Fixes: QTBUG-123773
Pick-to: 6.5
Change-Id: I80f4cb740dde47549e4357f08b6ae00c243b77b5
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 85ea1653dbdcd0f321746e6f4281c33e84d264af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Add example showcasing Embedding QML to native Android Java project 2024-04-10T19:52:27+00:00 Konsta Alajärvi konsta.alajarvi@qt.io 2024-02-20T13:01:02+00:00 b0aa6e69132c2c0bd8b71c2cddfb11cf54435343 Add new example showcasing how to embed QML into native Android Java application. New folder platforms/android, which include the new Android Java project and Qt project in their own project folders. Fixes: QTBUG-120716 Change-Id: Ibab8b7653eb7d4199b93630d03f3543d0d734c4a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 1fd9c628f51c4adc8db1a7c58695bea874ee9117) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
Add new example showcasing how to embed QML into native Android
Java application.

New folder platforms/android, which include the new
Android Java project and Qt project in their own project folders.

Fixes: QTBUG-120716
Change-Id: Ibab8b7653eb7d4199b93630d03f3543d0d734c4a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 1fd9c628f51c4adc8db1a7c58695bea874ee9117)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Modernize "extending QML" tutorial 2024-04-05T01:55:09+00:00 Ulf Hermann ulf.hermann@qt.io 2024-04-03T10:30:23+00:00 b53ad7ffd61173883cf71e316b1e67a3c603219c - Use qt_standard_project_setup() - Don't use NO_RESOURCE_TARGET_PATH - Use QQuickView::loadFromModule() Change-Id: Ie68fbcaaa8824ca1cfe186bc9ead905e705e97c7 Reviewed-by: Sami Shalayel <sami.shalayel@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit bb6cde5229bd15f6e233262ae46fffeda666cf3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
- Use qt_standard_project_setup()
- Don't use NO_RESOURCE_TARGET_PATH
- Use QQuickView::loadFromModule()

Change-Id: Ie68fbcaaa8824ca1cfe186bc9ead905e705e97c7
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit bb6cde5229bd15f6e233262ae46fffeda666cf3d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Correct license for examples files 2024-04-04T09:52:36+00:00 Lucie Gérard lucie.gerard@qt.io 2024-03-07T14:22:17+00:00 b750d87136c2ef3c2d95935050612082e33a6e72 Example takes precedent over build system file type. According to QUIP-18 [1], all examples file should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7.0 Task-number: QTBUG-121787 Change-Id: Ie8c2539e7659f53a1fd6b48f99ee883ee9aeb0a7 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 53295d9102632568ba3ea817d009f30317b9761a) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Example takes precedent over build system file type.
According to QUIP-18 [1], all examples file should be
LicenseRef-Qt-Commercial OR BSD-3-Clause

[1]: https://contribute.qt-project.org/quips/18

Pick-to: 6.7.0
Task-number: QTBUG-121787
Change-Id: Ie8c2539e7659f53a1fd6b48f99ee883ee9aeb0a7
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 53295d9102632568ba3ea817d009f30317b9761a)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>