Amends 0c02d0545a that broke the
.qmlproject file: remove the unsupported prefer line from the qmldirs
and remove the now empty qmldir to make the .qmlproject file work. It
turns out that the .pro project does not require the prefer line either
from the qmldir files.
Pick-to: 6.8
Change-Id: I5202b589d7320542238a889db66c3975befceab6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Make the samegame demo use qt_add_qml_module instead of qt_add_resources.
This populates build/qtdoc/examples/demos/samegame/SameGameModule
instead of build/qtdoc/examples/demos/samegame/content because content
is a bad QML module name ™️.
Use qt_standard_project_setup().
Use QQuickView::loadFromModule() in the main.cpp and add a qmldir in the
.qrc to make loadFromModule() work when using qmake.
Pick-to: 6.8
Task-number: QTBUG-100100
Change-Id: I23e197c99ff284f62fa9deae12afe9ddbd510861
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
In case player 2 had a higher score at the end of the game, the removed
line would set score to max(score, score2). This would then lead to the
image proclaiming player1 as the winner to be loaded in onModeChanged
by the game canvas in GameArea.qml.
Change-Id: I642d7dc757c4411ccbb836768ca192457057214e
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This reverts commit 8fc3cd6675.
Reason for revert: As opposed to the commit message, this is not a minimal port. It changes the directory structure of the example, by starting to popuplate the previously empty samegame/samgame directory inconsistently. It breaks qtdoc build with examples.
Change-Id: I0749043047b21a34b613f73e36f2ade629e41f8d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This is a minimal port that only establishes the module structure
without touching any of the actual QML code.
Change-Id: I122156d15c0ee391f519b0894a51acad99551c5c
Reviewed-by: Sami Shalayel <sami.shalayel@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>
Fixes warnings for
QML Connections: Implicitly defined onFoo properties in Connections are deprecated. Use this syntax instead: function onFoo(<arguments>) { ... }
Pick-to: 6.0
Change-Id: Ifa6065856e4947b779ab75922d05e50e8be985bd
Reviewed-by: Ulf Hermann <ulf.hermann@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>
These demos use several modules and moving them allows to use for
example Qt Quick Controls 2 in them.
The shared directory should be removed and the examples made
self-contained.
Change-Id: I5dc667d22388651894d7d145b65752bc5c5cf6cf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Sami Shalayel
Olivier De Cannière
Axel Spoerl
Ulf Hermann
Kai Köhne
Lucie Gérard
Venugopal Shivashankar