summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/scene2d/scene2d.pro
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2024-01-22 21:57:04 +0200
committerTarja Sundqvist <tarja.sundqvist@qt.io>2024-02-22 05:34:48 +0000
commit504c76c914bd06de010af480602f6d27551bcda6 (patch)
tree101f8dbd379a8918b641502133d53c9c1be07291 /examples/qt3d/scene2d/scene2d.pro
parent9147dedeaec429b01049eeca152b95a64466a717 (diff)
parentef051d6a341bd8e426715421622ed8d63d2afb40 (diff)
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file: dependencies.yaml Change-Id: I7436e415d509594cb8a50a60cc0228c6d32e048e
Diffstat (limited to 'examples/qt3d/scene2d/scene2d.pro')
0 files changed, 0 insertions, 0 deletions