aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlplugindump/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* use nullptr consistently (clang-tidy)Shawn Rutledge2018-02-261-5/+5
| | | | | | | | | | | | | From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-09-201-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4compileddata.cpp src/qml/compiler/qv4compileddata_p.h src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4qmlcontext.cpp src/qml/jsruntime/qv4qmlcontext_p.h src/qml/jsruntime/qv4regexpobject.cpp src/qml/jsruntime/qv4regexpobject_p.h src/qml/types/qqmllistmodel.cpp src/quick/items/qquickanimatedimage_p.h src/quick/scenegraph/qsgrenderloop.cpp tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp Change-Id: If20ef62b2c98bdf656cb2f5d27b1897b754d3dc0
| * qmlplugindump: skip imports containing "private"Marco Benelli2017-09-081-1/+1
| | | | | | | | | | | | | | | | | | Skipping paths that ends with "private" is not enough. Task-number: QTBUG-47027 Change-Id: I25af518b76f594c268db6b77dbafd343f2f57ee8 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-08-231-1/+1
|\| | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp Change-Id: I31375151eb239f348bec988d2d0506c2b4d9604c
| * qmlplugindump: fix bug in reading command lineMarco Benelli2017-08-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-58264 Change-Id: I317fb18d9ceb8738f2f132b8703dc1af3b17d35b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-08-181-62/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qqmltypecompiler.cpp src/qml/jsruntime/qv4qmlcontext.cpp src/qml/jsruntime/qv4qobjectwrapper.cpp src/qml/qml/qqmlcustomparser.cpp src/qml/qml/qqmlimport.cpp src/qml/qml/qqmlimport_p.h src/qml/qml/qqmlmetatype.cpp src/qml/qml/qqmlmetatype_p.h src/qml/qml/qqmltypenamecache.cpp src/qml/qml/qqmltypenamecache_p.h src/qml/qml/qqmltypewrapper.cpp src/qml/qml/qqmltypewrapper_p.h src/qml/qml/qqmlvmemetaobject.cpp src/qml/util/qqmladaptormodel.cpp Change-Id: Ic959d03e6f9c328fb02710d9abbb0f27cddde131
| * Change data structures in QQmlMetaTypeDataLars Knoll2017-08-021-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure any QQmlType stored in the meta type data has a refcount of 1. This should now make it possible to clean out unused types by iterating over the list of types and removing those that have a refcount of 1. Some care is still needed for C++ registered types, that will need to get one more refcount, so we don't accidentally remove them. Task-number: QTBUG-61536 Change-Id: Id2a18dae5ddcb815f34013f5fde1f05d2d9d0214 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Use QQmlType by valueLars Knoll2017-08-021-11/+11
| | | | | | | | | | | | | | | | | | | | | | QQmlType is now refcounted, and we need to use it by value, to control it's lifetime properly. This is required, so we can clean up the QQmlMetaTypeData cache on engine destruction and with trimComponentCache() Task-number: QTBUG-61536 Change-Id: If86391c86ea20a646ded7c9925d8f743f628fb91 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | qmlplugindump: fix "useQApplication set but not used" build errorMitch Curtis2017-08-041-0/+1
|/ | | | | Change-Id: If6c3e513814a7fab62ecdf7de728939c7d61263b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-241-8/+30
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4ssa.cpp src/quick/accessible/qaccessiblequickview_p.h src/quick/items/qquickmousearea.cpp src/quick/util/qquickanimatorjob.cpp tools/qmlplugindump/main.cpp Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
| * Fix typo in qmlplugindump error messagePeter Varga2017-01-311-1/+1
| | | | | | | | | | Change-Id: Icbe18330ae665b693047f098e219c3b665be22e9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * qmlplugindump: add -qapp optionMarco Benelli2017-01-311-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | Some modules (ie QtChart) require a QApplication instead of the QGuiApplication that qmlplugindump use by default. This option let the user specify if a QApplication is needed. Task-number: QTBUG-58264 Change-Id: I10e68d0d3eab2afad315b57fef9ce92c42e70124 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | qmlplugindump: reports qmlimportscanner's messageMarco Benelli2017-02-171-0/+2
| | | | | | | | | | | | | | | | Report to the user the stderr of qmlimportscanner, if needed. Task-number: QTBUG-58930 Change-Id: Ib8ddf12cb3d18c936eb151f12991900a32175576 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | qmlplugindump: import paths clean-upMarco Benelli2017-02-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove "qrc:/qt-project.org/imports" from the paths list passed to qmlimportscanner. qmlimportscanner will error out on a path that does not exist. Since the internal qrc:/qt-project.org/imports path only exists if the plugins are compiled in statically into qmlimportscanner, we have to remove this path to stop it from erroring out. Task-number: QTBUG-58930 Change-Id: I39525f2b6ff29c02b38f5f701342026dea871701 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-141-2/+18
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9d87ed86e95b5901a86cc3aa65d7ac39b0b708c2
| * qmlplugindump : Add a "-output" argument to specify the output fileJacques GUILLOU2017-01-051-2/+18
| | | | | | | | | | | | | | | | | | | | Having only the possibility to redirect the stdout of qmlplugindump to a file is both unconvenient and unreliable since some plugins might write content (such as logs) to stdout, which pollute the output. Change-Id: I8b1d482d7674945e6145d59aea839c54600e7784 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-141-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp src/qml/qml/qqmlimport.cpp src/quick/items/context2d/qquickcontext2dtexture_p.h tools/qmleasing/splineeditor.h Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5
| * qmlplugindump: avoid warningsMarco Benelli2016-12-081-4/+7
| | | | | | | | | | | | | | | | Wrap all global variable in an anonymous namespace in order to avoid compiler warnings on the uninizialized ones. Change-Id: Ifabb790d2d76b6056d706580b9e4c0f12f5119f0 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-231-0/+1
|\| | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4object_p.h Change-Id: Iff4d3aba7710a999b8befdc493cbe959e1ce02f9
| * Set Qt version on toolsFriedemann Kleint2016-11-091-0/+1
| | | | | | | | | | Change-Id: I21d77b2eba7107528fc00db0cf5d87f8347b63be Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-1/+1
|\| | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4isel_moth_p.h Change-Id: I8e86a649d1ef8ad27dc66cc8c290093b2faabc69
| * qmlplugindump: update QtQuick references to 2.8Marco Benelli2016-09-121-1/+1
| | | | | | | | | | Change-Id: I2d418d50c6300e107795dd4ebdd95c78cb1b2175 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | tools: use const (and const APIs) moreAnton Kudryavtsev2016-08-221-13/+13
| | | | | | | | | | | | | | For CoW types, prefer const methods to avoid needless detach()ing. Change-Id: If9018391c001eba3b4b2061d06c4caa8136811ab Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | tools: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-221-9/+15
|/ | | | | | | | Catch rvalues to prevent detach()'ing. Change-Id: I7be159a405c994429c0eee10805bfe96fcf4c806 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* tools: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-201-24/+24
| | | | | | | | | Mark some local variables or parameters as const to prevent detach()'ing. Use qAsConst where is not possible mark as const. Change-Id: I0a777c3bd855abd3bb1ad0907152360cf4a1050e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Do not override QT_QPA_PLATFORM env variablesAndreas Cord-Landwehr2016-08-161-1/+1
| | | | | | | | | | The QGuiApplication documentation explicitly says that QT_QPA_PLATFORM can be used to specify the QPA for every QGuiApplication. Unconditionally overriding this value within the application is a unexpected behavior. Task-number: QTBUG-54789 Change-Id: Ia7a61a0f2921ef8ec27fe630e8d307d20ba1eb37 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* qmlplugindump: Avoid warnings about missing createPlatformOpenGLContextKai Koehne2016-06-291-1/+2
| | | | | | | | Fixes a regression introduced in 541eb6b704b53a6e88. There's no point in setting AA_ShareOpenGLContexts for the minimal plugin. Change-Id: Ibcc65ede41acf5a8cf22eacef4b94c20048a354a Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* qmlplugindump: add a command line option.Marco Benelli2016-05-251-8/+23
| | | | | | | | | | | | | Add the option -noforceqtquick that prevent the inclusion of the QtQuick dependency in the resulting qmltypes file. Including the QtQuick dependency interfere with the generation of some qmltypes, such that the one of QtQuick itself. Change-Id: I63a44632b8dbabdd1ffecf16da050a9429e557da Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* qmlplugindump: Allow dumping of WebEngine pluginsKai Koehne2016-05-201-0/+1
| | | | | | | | WebEngineView requires a shared opengl context. The plugin checks for this when initializing. Change-Id: I686b9c22be95f7ef16ea68ea49b8f9aee47789ae Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* qmlplugindump: skip "private" directories.Marco Benelli2016-04-281-1/+1
| | | | | | | | | | | qmlplugindump used to skip directories called "Private". It seems that some directory called "private" are added, notably the one in QtGraphicalEffects. Such directories cause qmlplugindump to fail, so the name check is now case-insensitive. Change-Id: Ie564db7bf96d6596d5cd674adc125a9bcdcba7bb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-121-1/+41
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
| * qmlplugindump: option to merge qmltypes.Marco Benelli2016-02-021-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-221-2/+9
|\| | | | | | | Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
| * qmlplugindump: avoid generating conflicting types.Marco Benelli2016-01-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlplugindump used to import QtQuick, therefore skipping all QtQuick types when dumping. Now that it imports only Qt, it is no longer the case, and all QtQuick types would be dumped in the module's qmltypes file. It can be avoided by specifyng 'QtQuick' as dependency in qmldir file or in a json file passed as -dependencies option. It seems however that people are not used to that, so in order to restore the old behavior, the QtQuick dependency is automatically added when the dependency list is empty. Change-Id: I5fb2e57893607a877d284767b3fd09159b45ff42 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * QmlPluginDump: use QFileInfo::exist(f) instead ofAnton Kudryavtsev2016-01-191-2/+2
| | | | | | | | | | | | | | ... QFileInfo(f).exists(). It's faster. Change-Id: Id9dd30f5532ed73c487caffcaad3860a6475e832 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-201-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Tools: fix expensive iteration over QHash::keys()Anton Kudryavtsev2016-01-151-4/+4
|/ | | | | Change-Id: I902bafdbc2ddfceeacfc9ef274513a2b0a23aed7 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* qmlplugindump: Don't try to import Qt.test.qtestrootAlbert Astals Cid2015-12-151-0/+8
| | | | | | | | | | | Qt.test.qtestroot is only provided by quick_test_main so if we find any plugin that tries to inherit from TestCase.qml qmlplugindump will fail trying to import this unexistant import Change-Id: Idee881fa641267a17594dd3c92e929ca3473f3df Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* QmlJs: separate dumping of Qt built-ins and QtQml.Marco Benelli2015-11-271-3/+37
| | | | | | | | | | builtins.qmltypes used to contain also definitions that belong to QtQml. This patch makes qmlplugindump dump only Qt built-ins when called with the '-builtin' option, and makes dumping of QtQml work correctly. Change-Id: I123b9cae6f2557cf281f857df51fae095cbc25cc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Proper handling of composite types with different versions.Marco Benelli2015-11-031-9/+17
| | | | | Change-Id: I967da2eb1867f218d47faf8a589d1773e6f57fc7 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Tools: Fix single-character string literals.Friedemann Kleint2015-10-131-3/+3
| | | | | | | Use character literals where applicable. Change-Id: I55679dcc13c4c79567712c0dfaaabc2b84fee010 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Make QML composite types inherit attached propertiesJ-P Nurmi2015-10-091-10/+11
| | | | | | | | Change-Id: Ic06af4805da987dd08e361f2668e7a1788d3eefe Task-number: QTBUG-43581 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* qmlplugindump: Drop '.exe' suffix in commentKai Koehne2015-09-231-1/+1
| | | | | | | | This generates just noise in the diffs. Change-Id: I09d1dbc6d8255a9cf5055abf96eb06ca78a80a94 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-09-021-0/+8
|\ | | | | | | Change-Id: Ibc7a47f7ce6d15dff79fdc59f8ded297d1b8d50d
| * Warn if a composite type is not ready and continue.Marco Benelli2015-09-011-0/+8
| | | | | | | | | | Change-Id: Ib28f484188466831e4c64aee0e36a27dd4842b06 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Add 28 QList::reserve() callsSérgio Martins2015-06-081-1/+3
|/ | | | | Change-Id: Id4820ac458f48b10f2bf457144767efdef9e2c07 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* qmlplugindump: add dependenciesMarco Benelli2015-04-211-20/+221
| | | | | | Change-Id: I53b2a394ba1f6c8a7a88f7456fba8646cdf35bf4 Task-number: QTBUG-41079 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-121-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Fix build on MinGWKonstantin Ritt2014-12-281-1/+3
| | | | | | | | - alloca() needs malloc.h - crtdbg.h couldn't be found on MinGW Change-Id: Ibbf91a58d39ef1e2572baae3c409393acf7aa5df Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* qmlplugindump: Use _CrtSetReportMode() for MSVC only.Friedemann Kleint2014-09-191-2/+2
| | | | | | | | | | | | | | | | | | | Fix warnings when using MinGW: main.cpp: In function 'int main(int, char**)': main.cpp:734:55: warning: statement has no effect [-Wunused-value] _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG); ^ main.cpp:735:53: warning: statement has no effect [-Wunused-value] _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG); ^ main.cpp:736:54: warning: statement has no effect [-Wunused-value] _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG); where _CrtSetReportMode() is an empty macro. Change-Id: I644bc207b5a3df62d6390811f53b2c0948979d58 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 23:00:38 +0000