This confused the document TOC.
Pick-to: 6.10
Task-number: QTBUG-137892
Change-Id: I439b0dea28628f245aa20f2126edaf76065fd76d
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
The project name is used in Qt Creator as root name for the project.
Using the same name as the documentation/example name makes it
clearer which example is actually open. Only drop prefixes like
'Qt Quick Demo - '.
Pick-to: 6.10
Change-Id: I863a23e26307a973bb04ce879d0c95c3731cdc53
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Add an application icon (.ico file) as well as application metadata to
the executable .exe file on Windows.
The .ico file was generated from the existing *.png's in android
subdirectory by running
(find ../android/ -name "*.png" && echo "calqlatr.ico") | xargs magick
The .rc file was copied & then manually adapted from the photosurface
example.
Pick-to: 6.9 6.10
Task-number: QTBUG-138083
Change-Id: Icdec57d746d56ca3c0d6bd47d01d50719a1a9582
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The shown code snippet from BackspaceButton.qml is a bit arbitrary?
Better to just leave it out (we don't show content from
CalculatorButton.qml either).
Pick-to: 6.10
Task-number: QTBUG-137892
Change-Id: I9c70c8ccf5134a710a25294ab8ef802890b53c02
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Make sure that the example is also shown when one searches for 'calculator'.
Also add ios and android as tags.
Pick-to: 6.10
Task-number: QTBUG-137892
Change-Id: Ib29d141edd8cd3dd65d67040e1adec0aa1858175
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
The \skipto Text is meant to navigate to the line
contentItem: Text {
Anyhow, it already stopped at
function getTextColor() {
Make sure that this won't happen by making the text more explicit.
Pick-to: 6.10
Task-number: QTBUG-137892
Change-Id: Ia29d953528b1765c30f8d3550556c5460e48e5d4
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Do use qmlformat to make sure that the .qml files in
the example are uniform. Just leave out some changes that
make lines like
case Qt.Key_0: digitPressed("0"); break;
unneccessarily long.
Store the restriction to 100chars in a .qmlformat.ini file
for other examples.
Pick-to: 6.10
Change-Id: I3f77efa83b2d5e01f1497687763e5c327da71ff2
Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Set up a unique bundle identifier, and make sure that the app bundle
and executable is written with uppercase first letter, as it is most
common with native applications.
Pick-to: 6.10
Change-Id: Iab670446f5eb9f50e245c1b80149717c37a87096
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
There is no reason to name the target different from the project.
Pick-to: 6.9 6.10
Change-Id: Ice1ecc83c86a94cd60d7a77b6113434c34275f54
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This patch
-enables qmltooling in non release builds
-this will allow QML debugging to start and work
-this patch will do this to following examples:
-calqlatr, coffee machine and dice
Task-number: QTBUG-136794
Pick-to: 6.9 6.8
Change-Id: I4699285fa20021ec9d6e29c86a7a16516af085fa
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Setting this to 35 is not going to work properly as edge-to-edge is not
working properly yet in Qt for Android 15.
See https://developer.android.com/develop/ui/views/layout/edge-to-edge
Fixes: QTBUG-132360
Pick-to: 6.9 6.8
Change-Id: I46020d07e3aea59d57ebf1bef1b25f1f90971827
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
Configuring the examples will emit QTP0004 warnings. Setting them by
increasing the minimum version for qt_standard_project_setup.
Pick-to: 6.8 6.9
Change-Id: Iefaad04f4ea098d7ba942ce4ae38f29971b574c6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
In the calqlatr demo, you are able to use backspace to remove the last
digit. This does not consider the last minus sign left when using
backspace on a single digit negative number. In this case, set the
displayed digits to an empty string.
Fixes: QTBUG-127814
Pick-to: 6.7 6.8
Change-Id: Iec82e0650b3b50022be0b5a716976aefa78118a3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Projects were modified using the tool at:
https://git.qt.io/alcroito/cmake_refactor
Some examples had to be adapted manually, mostly those that build
additional qml modules / plugins.
documentviewer did not get the deployment api, because it's trickier.
Pick-to: 6.7
Task-number: QTBUG-101340
Task-number: QTBUG-102056
Task-number: QTBUG-102057
Change-Id: I76322185fc824c112d77e077ee39e7ccbc193a4c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
In order for the calqlatr example to successfully load Main.qml when
building with qmake, a qmldir file needs to be added.
In addition, the files listed in OTHER_FILES, were redundant, since
those files were already listed as qrc resources.
Fixes: QTBUG-123714
Pick-to: 6.6 6.7
Change-Id: Id773ecf93c9b113385121da62de99ced3f8debdf
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
The demo's buttons were using Mathematical Alphanumeric Symbols, which
are not available in all fonts. Replace them with regular characters.
Fixes: QTBUG-122605
Pick-to: 6.7
Change-Id: I24e61eb11f8df34149d0d0fd962054ea759729c1
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
According to QUIP-18 [1] all files under examples
should be licensed
LicenseRef-Qt-Commercial OR BSD-3-Clause
[1]: https://contribute.qt-project.org/quips/18
Pick-to: 6.7 6.7.0
Task-number: QTBUG-121787
Change-Id: Ia2e8f62af64a384196a9b0c02ac5b2fbf5404a8b
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
The format for the package name for Android should follow the file
structure. Therefore, "org.qtproject.example" should be
"org.qtproject.example.calqlatr".
Fixes: QTBUG-121660
Pick-to: 6.6 6.7
Change-Id: Ic3281ec8ab695f5a10c368e736200aed9d9d8d0b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Projects need install instructions to be usable on embedded platforms.
Fix existing instructions to put files into correct places.
Fixes: QTBUG-112024
Pick-to: 6.7
Change-Id: I6a3d84edc1c67281d5497e99144c159faf0f783c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Implement the new design for the calqlatr example, including a
scientific/landscape mode. The animation controller has been removed for
practicality. Responsive layouts now handle changing between a portrait
and a landscape layout.
Fixes: QTBUG-118519
Change-Id: I1a33b1825a877b2b45afedc3a019a906c3f45d29
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
I Followed instructions at https://doc.qt.io/qt-6/ios-platform-notes.html
about app icons.
Fixes: QTBUG-118576
Pick-to: 6.6
Change-Id: I471065f98a59611522dfc037713e9fc59ed90f60
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
I added the target sdk property to the app target,
refactored to use set_target_properties.
Pick-to: 6.6 6.6.1
Change-Id: Ie3796ac23a77916ee65420d9923386a0252b1c04
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Used Qt Creator to add the icons and updated the CMake file to use
the custom manifest.
Task-number: QTBUG-118513
Pick-to: 6.6
Change-Id: Icdf0b877d9860f911e615ae8a12d820f5b701e71
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
- Fixed code formatting.
- Clip the contents of the ListView containing the operation history to
prevent it from spilling out into other UI elements.
- Update copyright year.
- Simplify some expressions.
- Replaced root scope lookups with direct access to JS functions.
- Make calculator.js a library so that it can be imported by
other QML files without duplicating its state.
- Replace "var" with "let".
- Replace == and != with === and !==.
- Simplify key event handling.
- Removed unused ids.
- Fix unqualified accesses.
Fixes: QTBUG-54267
Pick-to: 6.2 6.5 6.6
Change-Id: I0d8e8f1d9b3cfe8123fd98b8c280dc3ff4bd86a0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Add mobile example category tags for the chosen examples.
Add for the ones that work best for both Android and iOS.
Remove from the ones that do not work for both (at least yet).
Added, as verified on Android
-calqlatr
Removed (for now), as not verified yet on Android
-todolist
Removed (for now), as not valid anymore nor verified
-qtpurchasing-overview
Fixes: QTBUG-116780
Pick-to: 6.6
Change-Id: I937a90fe54ff87f29cf32627356aa5a65dd51d43
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@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>
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>
Set basic style for the application to get rid of "The current style
does not support customization of this control" warning in
CalculatorButton.qml.
Task-number: QTBUG-108751
Pick-to: 6.5 6.6
Change-Id: Id9b8305238404088fd24d4e128a753728558f10a
Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Prefer unversioned commands over qt6_ ones - even though the
target-based qt_add_resources command is actually new in Qt 6.
But we will evolve the API also between major Qt versions,
so it's better to work with the Qt policies mechanism instead
of relying on version numbers in the command API.
Pick-to: 6.5
Change-Id: If302abb1f22a7ab96c98a8ad2e9c871b9bedb0e9
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Use e.g. Qt6::Core instead of Qt::Core. This is better matching the
find_package(Qt6 ...) call, and also avoids issues that the versionless
targets have.
Pick-to: 6.5
Task-number: QTBUG-113277
Change-Id: I9bc7963d8524ef2ab061e32aef428711646247a7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
The '\meta category' command was used for tagging examples with a
specific category, used in Qt Creators Welcome mode.
As we want to also generate lists of examples belonging to a category
elsewhere in the documentation, replace the command with a macro that
expands to the original \meta command and also adds the example to
a group using the \ingroup command. This way, the category names can
be used as arguments to the \generatelist or \annotatedlist commands.
Pick-to: 6.5
Task-number: QTBUG-112731
Change-Id: I8590894bdd31d69c38a60cdd42f7301e2cecd2ed
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Mark Coffee, Calcqlatr, Photo Surface as part of the
Applications category, which we want to prominently
feature in the next generation of QtC's example screen.
While at it, also simplify the names.
Pick-to: 6.5 6.5.0
Task-number: QTBUG-108751
Change-Id: I34e7a2b3aad0db9cb2e79f683bce19554dc4002d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
The buttons were too hard to hit, with such big gaps between columns and
rows, and such a small active area. You can't see how big the active
area is, so the expectation is that it should be large, for easy
fat-fingering on a touchscreen.
Pick-to: 6.2 6.4
Task-number: QTBUG-102408
Task-number: QTBUG-108335
Change-Id: I9aab5d64a8c6c0a0218e9a91f93d072033e04e8a
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Only the coffee machine example had some tags already. Add them
also for the rest, but inside the .qdoc file, instead of the
more clunky/verbose tagging in the .qdocconf file.
Pick-to: 6.4
Change-Id: I37640c2296c67413361f7987122c5e7daa1f12b0
Reviewed-by: Topi Reiniö <topi.reinio@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: I9499ba4c20f610ffe8af0fc3e29e6581247f2c40
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: Idfd176b7f7b077a5b7c66b7738dc9bcac94ab290
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
CMAKE_INCLUDE_CURRENT_DIR is not necessary anymore for moc since
CMake 3.8: https://cmake.org/cmake/help/latest/release/3.8.html#other-changes
Enable CMAKE_AUTOUIC only if .ui files are present.
Pick-to: 6.3
Change-Id: Ic34418e3306de0ee1769bc3153bb833f7951da19
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
In the process of preparing this example to become highlighted
in Qt Creator, we want to update it to reflect how we think a modern
qml application should be written.
Some of the changes done here includes
* Use QQC2 buttons, rather than a custom button component.
* Update the CMake list to use qt_add_qml_module()
* Some code refactoring (e.g const/let instead of var, switch/case,
reduced binding spaghetti)
Fixes: QTBUG-96460
Pick-to: 6.2
Change-Id: I6e6789038c053dac9528ba564431cef6c9168454
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Several things are addressed:
* some unqualified accesses fixed
* parent is replaced with actual ids
Change-Id: I5ee1d1a2b1abad468ea330cd4eca0bf0b9b993ed
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Ignore .ui.qml files though for now, until they are properly handled
by Qt Design Studio.
Task-number: QTBUG-89033
Change-Id: I85ea1dc2f85928e9fa1f473535687ab8b0288e9d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Kai Köhne
Owais Akhtar
Rami Potinkara
Assam Boudjelthia
Tim Blechmann
Ed Cooke
Alexandru Croitor
Fabian Kosmale
Samuli Piippo
Lucie Gérard
Nicholas Bennett
Mitch Curtis
Friedemann Kleint
Kimmo Leppälä
Topi Reinio
Amir Masoud Abdol
Shawn Rutledge
Venugopal Shivashankar
Oliver Eftevaag
Andrei Golubev