The examples do not need to link against Quick3D, but they use Quick3D
QML import. Qt Quick3D is an optional component in the online installer
though, so its easy to miss. By adding Quick3D to find_package(),
we exchange a runtime error with a configure error in this case:
error: Found package configuration file: C:/Qt/6.6.0/msvc2019_64/lib/cmake/Qt6/Qt6Config.cmake but it set Qt6_FOUND to FALSE so package "Qt6" is considered to be NOT FOUND.
Reason given by package: Failed to find required Qt component "Quick3D". Expected Config file at "C:/Qt/6.6.0/msvc2019_64/lib/cmake/Qt6Quick3D/Qt6Quick3DConfig.cmake" does NOT exist
Pick-to: 6.5 6.6
Task-number: QTBUG-114998
Change-Id: I092068c5055d329769986da8d39605cb1bae3a4f
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
A had initially intended to expand this documentation more exhaustively,
however, I decided that example documentation that describes each discrete feature already exists.
Added sections, expanded a bit, referenced existing applicable example
documents, and the fact that this example will be available already
built for Android in the Google Play Store.
Fixes: QTBUG-114599
Pick-to: 6.6
Change-Id: Id989d82a40fb95808a42aa1b497b4d76161b5d74
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Added the features in line with the spike outcome.
In addition, I modified the spawnDice function to
estimate if all dice are at rest before enabling spawning.
This prevents duplicate shake events and double tap
fumbles.
Task-number: QTBUG-116491
Pick-to: 6.6
Change-Id: Ia0dc59e469e008da5fc3afe2a7342381eadc1008
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
The code is only used in an example.
Fixes: QTBUG-116580
Pick-to: 6.5 6.6
Change-Id: I9a045d128a8f36e442ab38dd2fee0d84b31511e2
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Fixes documentation warning:
(qdoc) warning: demos/documentviewer/plugins/txtviewer:
Example documentation should have at least one '\image'
Pick-to: 6.6
Change-Id: I6ceee59e42358c7fb67c332529d184d99e103513
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Fix link targets for section titles that are incorrect or were changed
elsewhere in the documentation.
Also,
doc/src/howtos/installer-cli.qdoc:
* Style double-dash in the section title with \tt. Without \tt, QDoc
interprets -- as 'en dash'; the output is incorrect and the special
character also prevents linking to the section title.
examples/demos/documentviewer/doc/src/txtviewer.qdoc:
* Add missing end delimiter for the comment block, and fix linking to
the parent example (Document Viewer).
Pick-to: 6.6
Change-Id: Ic660fa66e6ce87046664771349e3720f51c90352
Reviewed-by: Safiyyah Moosa <safiyyah.moosa@qt.io>
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
* Explicitly link to MediaPlayer module so it gets packaged to the APK.
* Allow the example to user nameFilters after the fix
0f4181919663e85ddc142456b357dcde3d0a4a7f.
Pick-to: 6.6
Change-Id: I16c2feccb90ce7448ae24d03868fbedf3c449e66
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Fix QML runtime warnings:
qt.qml.context: qrc:/demos/stocqt/content/StockListDelegate.qml:99:13 Parameter "text" is not declared. Injection of parameters into signal handlers is deprecated. Use JavaScript functions with formal parameters instead.
qt.qml.context: qrc:/demos/stocqt/content/StockListDelegate.qml:63:13 Parameter "text" is not declared. Injection of parameters into signal handlers is deprecated. Use JavaScript functions with formal parameters instead.
Pick-to: 6.5 6.6
Change-Id: I2d3d5fe6db56456777d7df0c8fbfda970994a22e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Revert removal of the example from the default built that was done in
3f9c25bdb78941da8b40. Use different names for the clashing CMake
targets.
Pick-to: 6.5 6.6
Change-Id: Ife9b796fa416091505acfd9b5f59cc4ea6ab93f9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Move all icons in an "icon" folder of the respective module.
Rename Config.iconSource() to Config.iconName() and change it to just
return the icon name according to theme without any path.
Add 2 singletons to each module providing iconSource() functions
doing the lookup relative to their locations.
Pick-to: 6.6
Task-number: PYSIDE-2206
Change-Id: I8e74ce633400ae170f0fdb467a2ae65f172319b8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Remove links to examples that no longer exist, and fix linking to
page/section titles that have changed.
Fix other minor issues in passing.
Pick-to: 6.5 6.6
Change-Id: I6420fd7319e021f8a31f1776b31fabd05631c145
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Don't calculate this inside the for loop.
Pick-to: 6.5 6.6
Change-Id: I09d46e363325071086332d901235f0feeabbb474
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Both QtQuick and Qt3D feature an AnimationController type. Make sure
the right one is linked to.
Pick-to: 6.5 6.6
Change-Id: I292765f5ccc7fcd8228e461fc375b0a9b71768d6
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Quick3D is an optional component in the online installer. As the examples are part of qtdoc,
they are however installed & available also if Quick3D is missing.
Let's at least mention the dependency in the respective examples' documentation.
Add a general 'Running the Example' section if missing, too.
Pick-to: 6.5 6.6
Fixes: QTBUG-114998
Change-Id: If4d3b48b3d0352a0359f6962d4eb1bc2e1e67c95
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Establish a common file layout allowing
Python and C++ to use loadFromModule().
Add a manually created qmldir file for usage by Python and the qml tool
(note CMake will still generate its own).
Pick-to: 6.6
Task-number: PYSIDE-2206
Change-Id: Idf2564ed84bd6c95e76dacdfbc0a9691c64e5f15
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
The bug is fixed but the workaround was actually not needed to begin
with since the bug only affects nodes with a position and a parent with
scale which is not the case here.
Pick-to: 6.5 6.6
Change-Id: I99766586d2671b3286085d54c7cf8cca7e0f9b7b
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Shorten the file names for *plugin.cpp by specifying
a CLASS_NAME.
* Add sources from Qt Design Studio components instead
of cloning from qtquickdesigner-components.git. This
avoids issues with the very deep directory structure
of above repository.
While at it, move also the MaterialBundle plugin from
asset_imports to just imports.
Task-number: QTBUG-115108
Pick-to: 6.5 6.6
Change-Id: I63d5fde474fbda93cfabec20e2349854755cc4cb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
It is a viewer after all, with no save functionality.
Pick-to: 6.6
Change-Id: I9a6f2c2809719abe33238b23a30cc9a06dc43c19
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Apply a few fixes that were already done for the other plugins.
Pick-to: 6.6
Change-Id: I3b94547023f77952a670cb7c0385b15e7ddd03ce
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Apparently, QPdfViewer needs an open file.
Pick-to: 6.6
Change-Id: I891f6eeb5a96344bdfce483e77c67b80b1666676
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Set the organization name to "QtProject".
Set an application name to Hangman to be used by QSettings.
Remove unused QSettings instance from Thermostat.
Let QSettings in Document Viewer use defaults.
Pick-to: 6.6
Change-Id: I8ebaeb444cd18bab95424f0efea670b02d41e657
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
A document viewer typically uses read-only.
Pick-to: 6.6
Change-Id: Ic5a601c0b5af9d0e97a47368d71e8daa9e5e0244
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Remove unused values and introduce Other for a number of RemoveReasons.
Pick-to: 6.6
Change-Id: I6ea170cac0dc04d0b5d9326441be5519ad544ba0
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Inheriting containers is considered bad practice and also not
possible in Python.
As a drive-by, change the loop removing dangling files and duplicates
from range based for to index-based, as actually removing a file
would invalidate end().
Pick-to: 6.6
Change-Id: I826aebe1000d412d94e63a0564db7485b9550ca5
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Add a .qrc file, which can be browsed in Qt Creator.
Remove the hard-coded build paths from the .ui file, which prevents
it from being used for Qt for Python.
Pick-to: 6.6
Task-number: PYSIDE-2206
Change-Id: I4ed7de87c79c964da1d0adaa9330fbab137de1e8
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Make it a required property which is always set with a check.
Pick-to: 6.6
Change-Id: I7771bcbe7b3ccc798b885682135d501e2d4d60ee
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
In addition to Application Example category, Todo List is added to
Mobile category
Pick-to: 6.5.2 6.5 6.6
Change-Id: Iabad05dfe24ecc9e9f188495b5aba65ec4132eda
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
In addition to Application Example Media, Player is added to Mobile
category
Pick-to: 6.5.2 6.5 6.6
Change-Id: If4ba1813006fae626c6ea4a16f19bee34fc08f43
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
This patch adds a snippet based documentation of TxtViewer's code with
the target to replace the Application example in widgets.
Pick-to: 6.6
Change-Id: I25045c8f710ae110398e71099c276571cb32ecf3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
When the path for CustomControls was changed into
ThermostatCustomControls, the icon paths in qt_attribution.json were
not adapted.
This patch updaes it.
Task-number: QTBUG-114759
Pick-to: 6.5.2 6.5 6.6
Change-Id: I8ec1ea85612f4a70d6baa99223e15a6c12ae4891
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
This unearthes that JSON should convert from UTF-8.
Pick-to: 6.6
Change-Id: If155b745cac0579232b927a3988588204c31d207
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Examples should be available under Commercial/BSD-3-Clause, not GPL.
Pick-to: 6.5.2 6.5 6.6
Change-Id: I0599bd69a7b850cdae04c26f8af0eb98a6583221
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Adapt the file quoting command in the documentation to match changes
in the source code.
Pick-to: 6.6
Change-Id: I6f3a93b4efff8df8d7cd6f8244b610b1ad93e4ba
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
The name of the module is changed from CustomControls to
ThermostatCustomControls due build errors.
Fixes: QTBUG-114759
Pick-to: 6.5.2 6.5 6.6
Change-Id: I86cf9830700b867a4a690d0f41841417bfa1efc1
Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: <kaj@spyro-soft.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The QDS components are built by default, which generates a lot of
warnings by qmlsc, and also creates issues on Windows due to
too long paths. But they are not used, so we might as well remove
them from the examples.
Pick-to: 6.5.2 6.5 6.6
Change-Id: Ie932b05c88f07793a95e4980cb4f63aa0a58229e
Reviewed-by: <kaj@spyro-soft.com>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
The argument passed to \example must be a valid path to the example
project directory, relative to 'exampledirs' variable in .qdocconf
Pick-to: 6.5.2
Change-Id: I94cdb7ddbce899d45c59af278d71c49cb0580f0e
Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Kai Köhne
Friedemann Kleint
Nicholas Bennett
Topi Reinio
Assam Boudjelthia
Inkamari Harjula
Jonas Karlsson
Kimmo Leppälä
Axel Spoerl
Kamil Hajdukiewicz