diff options
| author | Marco Benelli <marco.benelli@theqtcompany.com> | 2016-01-08 11:25:47 +0100 |
|---|---|---|
| committer | Marco Benelli <marco.benelli@theqtcompany.com> | 2016-02-02 14:58:21 +0000 |
| commit | 7b38d8e0025aba6366fd2f222838cf99f6bd15f3 (patch) | |
| tree | 1b464c69033a51d233176c414d52e953f85fbefb /tools/qmlplugindump/qmlplugindump.pro | |
| parent | 1929fee8e17e9ca66e7fe08faa9ed9fa7fdbb127 (diff) | |
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>
Diffstat (limited to 'tools/qmlplugindump/qmlplugindump.pro')
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 6fdcd349d1..e45a7fad83 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -6,10 +6,12 @@ QTPLUGIN.platforms = qminimal SOURCES += \ main.cpp \ - qmlstreamwriter.cpp + qmlstreamwriter.cpp \ + qmltypereader.cpp HEADERS += \ - qmlstreamwriter.h + qmlstreamwriter.h \ + qmltypereader.h macx { # Prevent qmlplugindump from popping up in the dock when launched. |