Commit Graph

9 Commits

Author SHA1 Message Date
Sami Shalayel 0c02d0545a samegame demo: port to qt_add_qml_module
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>
2024-09-09 15:31:41 +02:00
Axel Spoerl a86081100d Revert "Port samegame to qt_add_qml_module"
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>
2024-01-17 07:16:10 +00:00
Ulf Hermann 8fc3cd6675 Port samegame to qt_add_qml_module
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>
2023-12-21 17:32:56 +01:00
Friedemann Kleint 17e7109f01 Examples: Use consistent organization names and settings paths
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>
2023-07-04 13:43:26 +00:00
Lucie Gérard 6f57506953 Use SPDX license identifiers
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>
2022-06-07 18:23:52 +02:00
Robert Loehning 01b88573eb Examples: Don't enable high DPI scaling explicitly
Compiler complains that's deprecated and always on.

Change-Id: Ic42db6288cde5c95093715afd5df98368d67bd1f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-10-23 13:07:39 +02:00
Kai Koehne cc1a7a75ec Make examples self-contained
Remove shared main entry function and shared resources (that were not
used anyway), and simplify the entry point:
* Get rid of special handling of QT_QUICK_CORE_PROFILE,
  QT_QUICK_MULTISAMPLE environment variables.
* Remove QQmlFileSelector, which is not used in the examples.
* Do set QtCoreAppication::organizationName to 'QtExamples', so that the
  settings are separate from QtProject. This follows recent changes in
  Qt WebEngine examples.

Change-Id: I01851b3434901fefc2738136a2f1795d682a3233
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2019-01-24 11:00:51 +00:00
Frederik Gladhorn bf8e5b17c1 Move shared example folder to examples/demos/shared
The root examples directory should not contains shared folders. In the
past multimedia was the only module installing things there, now the
qtdoc module started doing the same. Let's clean up both.

Fixes: QTBUG-69784
Change-Id: Id9f98711e1dff3f610bafddc2a8bebbb764e1504
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
2018-08-20 15:00:50 +00:00
Venugopal Shivashankar 70ce5f4d3e Move demos to qtdoc repository
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>
2018-07-09 12:43:59 +00:00