Commit Graph

3 Commits

Author SHA1 Message Date
Lucie Gérard 0dc4fd240a Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
Files that have to be modified by hand are modified.
License files are organized under LICENSES directory.

Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-06-11 08:05:15 +02:00
Jani Heikkinen 7a1c8715cb Fix licensing
- Remove unused license files
- Switch old LGPLv21 license headers with GPL-EXCEPT one

Task-number: QTBUG-57147
Change-Id: Ib59c3e2e39bfe0038db795af85dc75028564efa3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-05-04 04:30:21 +00:00
Marco Benelli 7b38d8e002 qmlplugindump: option to merge qmltypes.
QtCreator does not handle dependencies between Qml types defined in
different qmltypes files.  Sometimes manual editing of qmltypes file is
needed to let QtCreator find the missing type information.
With the new -merge option it is possible to merge a qmltypes file to
the output of qmlplugindump.  Dependencies are correctly merged but
components are simply added, so they could cause conflict.

Change-Id: I6569339e4f05d37ea63fa2173983b4d595ae0ad6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-02-02 14:58:21 +00:00