aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlplugindump/qmltypereader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix licensingJani Heikkinen2017-05-041-17/+12
| | | | | | | | | - 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>
* qmlplugindump: fix regexp for plugins.qmltypesJ-P Nurmi2016-08-091-1/+1
| | | | | | | | | | | The latest plugins.qmltypes files contain whitespace after "dependencies:". Furthermore, just for the sake of correctness, escape dots in the QtQuick.tooling module import URI and version. Change-Id: I54fa288bc530f7852747c75b4d656e789d519cf2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* qmlplugindump: option to merge qmltypes.Marco Benelli2016-02-021-0/+63
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>