aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlplugindump/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Qmlplugindump error messages are not written consistentlyDaniel Pesch2014-01-231-16/+16
| | | | | | | | | | | | For errors in command line parameters qmplugindump uses cerr but errors during plugin loading are logged using qWarning(). It would be better to log always to cerr in case of problem because some platforms (BB10) have logging from Qt redirected. Task-number: QTBUG-36378 Change-Id: I04506c2f12b87190966e66c482f4ac5aed44af05 Signed-off-by: Daniel Pesch <dpesch@blackberry.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmplugindump is not able to dump all registered componentsDaniel Pesch2014-01-211-0/+16
| | | | | | | | | | | | This patch implements a new function QQmlMetaType::qmlAllTypes() used by qmlplugindump that returns list of all registered components. Previous implementation used QQmlMetaType::qmlATypes() call that returned only components with defined QML name. Task-number: QTBUG-36199 Change-Id: I85acba61cfa511973a004934cf0650f38cc46ed9 Signed-off-by: Daniel Pesch <dpesch@blackberry.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmlplugindump: New component properties isCreatable and isSingletonDaniel Pesch2014-01-201-13/+33
| | | | | | | | | | | | | Qmlplugindump tool does not generate information about singleton status and creatability from QML for a component. This patch adds two new boolean properties that contain this information. It is used by Momentics IDE for providing better code validation and could be used by QtCreator in future in similar way. Task-number: QTBUG-36139 Change-Id: If85374a1854aaa0727670b27df735d481cab5337 Signed-off-by: Daniel Pesch <dpesch@blackberry.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmlplugindump: adding verbose output for the instantiation operationsFawzi Mohamed2013-09-191-2/+18
| | | | | Change-Id: Ic18d85de92f05c01b6ce00b071ef9b94d878434f Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* qmlplugindump: Update the description for the generated fileCaroline Chao2013-09-181-2/+3
| | | | | | | | | | The full command was written in the generated file including the full path to the qmlplugindump tool. Now only the tool name without its full path will be printed with the adjacent arguments. Change-Id: I03aa7350d1cd6b96ce00341796f8944669989793 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* qmlplugindump: Add --defaultplatform argumentCaroline Chao2013-09-181-2/+15
| | | | | | | | | | QT_QPA_PLATFORM is set to minimal by default unless --defaultplatform is set when running the qmlplugindump tool. This is for example useful for the QtQuick.Dialogs module. Change-Id: I1194526ee0641d11802c4db20bd3043aebd1e261 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* qmlplugindump: QMetaMethod signals have public accessCaroline Chao2013-09-181-1/+1
| | | | | | | | | Since 56bbf3c2d5b31142e5a1b872a0118479edcf874b (qtbase) So public signals must be dumped. Change-Id: Ic7047660fbac40f78c7a205e760c059256c71d6f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* qmlplugindump: fix prototypes identification for composite typesCaroline Chao2013-09-171-11/+11
| | | | | | | | | The prototype name for the composite type is the first "default" prototype found in the reachable types. If none is found then the default value is QObject. Change-Id: I40b4fefaab40e4c9f83d24c89bd026579be63e7b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmlplugindump: Add support for composite typesCaroline Chao2013-09-131-54/+139
| | | | | | | Task-number: QTBUG-33106 Change-Id: I80fc817eb59256e860f3fdd591104930688ef84c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Remove qSort usages from declarativeGiuseppe D'Angelo2013-09-131-1/+2
| | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add --noinstantiate to qmlplugindumpAlan Alpert2013-05-291-38/+44
| | | | | | | | | | This flag allows you to run qmlplugindump on plugins which cannot safely create objects, such as plugins with unusual requirements or missing essential dependencies. Change-Id: Ifcc542b8dec5358fc8a76d78a2a272c9cbf5d78a Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmlplugindump: add an explicit -relocatable switchFawzi Mohamed2013-04-241-2/+7
| | | | | | | this will enable us to switch the default to nonrelocatable Change-Id: Ic4bff6466ee2fb6d4d1dd89829034ad239422a7e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: Fix module name formatSze Howe Koh2013-04-231-1/+1
| | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtGui -> Qt GUI QtMultimedia -> Qt Multimedia QtScript -> Qt Script QtSensors -> Qt Sensors QtSvg -> Qt SVG QtWebkit -> Qt WebKit Also fix a broken link to "Qt WebKit QML Types" Change-Id: Ica6081024d3957a3ca2ef3d870f623506c69d877 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qmlplugindump: always output exportMetaObjectRevisionsFawzi Mohamed2013-04-151-6/+2
| | | | | | | | | | Some people were confused about exportMetaObjectRevisions, and the "all 0" as default was not expected. Make it explicit so we might change the default in the future. Change-Id: I1f208ba54e2b9aa1a5d46fb9971572467b69ab56 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* qmlplugindump: don't crash if a composite type was a registeredShawn Rutledge2013-02-181-4/+6
| | | | | | | | This doesn't actually result in putting any information about the composite type into the output, though. Change-Id: I160702578f0acd22eff98e8afa288b3c9fb20076 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QmlPluginDump: Prevent crash if run without WMKai Koehne2012-11-301-0/+3
| | | | | | | | Make sure that the minimal platform plugin is used by default. Change-Id: I2362649dafaf823b00ab37519b516aef9ac3166b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* qmlplugindump: Update help outputKai Koehne2012-09-181-1/+1
| | | | | | | | Qt.labs.particles 4.7 doesn't work since ages. Instead use Qt.labs.folderlistmodel 2.0. Change-Id: Ie11133adad88ac6120ab05aef9713f8e768f8bc8 Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* qmlplugindump: Fix handling of implicit signalsKai Koehne2012-09-101-1/+1
| | | | | | | Change I70affc450 added inverted logic. Change-Id: I6cb25d3881a0487545a3eeac289a34fedcc21d8f Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* doc: fix some more typosSergio Ahumada2012-09-101-1/+1
| | | | | Change-Id: I7fa055049b9e5900d597754c6004febb153de12b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* qmlplugindump: Fix dumping of typesKai Koehne2012-09-071-1/+1
| | | | | | | Dumping broke with commit 70a2c049. Change-Id: Ifbae3dbc3e2d255c1e7f8848c579c04d0bf4b48e Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* qmlplugindump: Take care of 'void' typesKai Koehne2012-09-071-2/+2
| | | | | | | QMetaMethod::typeName() does now return "void" instead of an empty string (change 22d621dd). Change-Id: I70affc450a7dd36b121cbcf580c0ca6fd5944f0b Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Refactor singleton type registration codeChris Adams2012-08-281-58/+16
| | | | | | | | | | | Previously each singleton type was registered as an implicit separate import. This commit changes the code so that these types are treated just like any other type in the registration sense. It also ensures that singleton types are instantiated per-engine. Change-Id: I5c81c4ca5bf65210f7125d74a62a282a21838068 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Add type name to singleton (module api) implementations.Glenn Watson2012-08-081-19/+22
| | | | | | | | | | | | | This change renames the previous module api implementation to singleton types. When a singleton type is registered, a type name must be provided that is used when accessing the API from QML. This makes the implementation more consistent with the rest of QML. Task-number: QTBUG-26549 Change-Id: Iab0bb1ccf516bd3ae20aee562a64d22976e0aecd Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* qmlplugindump: Add comment to file that it was auto-generatedThomas McGuire2012-07-041-2/+4
| | | | | | | | | This prevents people who do not know about this tool from accidentally changing these files by hand. Change-Id: I8ff889b953f7c637f914f8b5b8b07a36f3cdf58f Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-041-2/+2
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I03084595ddc425a988374b8352fd23e9504ffba6 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Adapt to Qt5 meta-object changesKent Hansen2012-03-131-10/+5
| | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and it now returns a QByteArray. Also, the new function QMetaMethod::isValid() should be used to determine whether a method is valid, instead of relying on signature() returning a 0 pointer. Where it makes sense, the existing code that was using signature() and parameterTypes() has been changed to use the new API QMetaMethod::name(), parameterCount(), and parameterType(int). Also, in the new meta-object revision (7), the QMetaObject stringdata member is now of type QByteArrayData*. QFastMetaBuilder will be ported to generate the new format, but for now it's sufficient to reinterpret_cast the stringdata assignment to keep it compiling. Change-Id: Ie340ef17bcebc3afa4aae6450dfe2d06e4d881a4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Merge master <-> api_changesMatthew Vogt2012-03-051-1/+1
|\ | | | | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
* | Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-33/+33
|/ | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-25/+2
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmlplugindump: Don't depend on qtquick1 and widgets.Christian Kamm2011-12-091-3/+26
| | | | | Change-Id: I38baaf2d8d02c3f35d2dece9fc580c6e1fee872d Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* qmlplugindump: Fix dumping of extended QGraphicsWidget.Christian Kamm2011-12-081-4/+5
| | | | | Change-Id: Id574b4ee98f7d985ef06619956b2c02cac68b553 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* qmlplugindump: Avoid reporting types as attaching to themselves.Christian Kamm2011-11-291-2/+6
| | | | | | Task-number: QTCREATORBUG-6625 Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* qmlplugindump: Fix QObject dump.Christian Kamm2011-11-221-2/+30
| | | | | | | | | * Hide deleteLater and the destroyed signal. * Add destroy and toString functions. Task-number: QTCREATORBUG-4903 Change-Id: Icbae3e1c82605baa84ac9cc8f38cd747e4dcf687 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* qmlplugindump: Fix dumping empty names for generated QMetaObjects.Christian Kamm2011-11-171-4/+29
| | | | | | | | Task-number: QTCREATORBUG-6543 Reviewed-by: Roberto Raggi Change-Id: I2e85432ea8ff84ea4172e462782c0484ed75dcde Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* qmlplugindump: Add flush to fix output redirection on windows.Christian Kamm2011-11-031-1/+1
| | | | | | Task-number: QTCREATORBUG-5825 Change-Id: I26c2ecb77a89b352de97c70ff17fd076872a636b Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* qmlplugindump: Dump QObject based module api.Christian Kamm2011-10-281-4/+58
| | | | | Change-Id: Icc18392f63cd505e0264567e6c7d2d4cf7dac021 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add DropArea item and Drag attached property.Andrew den Exter2011-10-101-2/+1
| | | | | | | | | | | | | | | | | | | Refactors drag API to improve compatibility with traditional drag and drop by reusing events and adding drop actions. Event sending is removed from MouseArea, instead the Drag object can be attached to the item that is dragged and it will send drag events when the position of that item is changed or when its active property changes. The DragTarget item is renamed to DropArea and can now communicate supported and suggested actions. Task-number: QTBUG-19747 Change-Id: I46cb77e68cf1ff32bbcbf0945facb593c9c2243c Reviewed-on: http://codereview.qt-project.org/4638 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* qmlplugindump: Don't dump implicit signals.Christian Kamm2011-10-061-5/+18
| | | | | | | | Every property automatically has a xyzChanged signal anyway. Change-Id: I470875a94792c0fc5a6378c8be1e0eddc24a1d5a Reviewed-on: http://codereview.qt-project.org/6144 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* qmlplugindump: Explicitly add QSGMouseEvent to be dumped.Christian Kamm2011-10-061-0/+7
| | | | | | Change-Id: I93f29f151e82a3d47fb10ff587fe28ea27a2d7b4 Reviewed-on: http://codereview.qt-project.org/6143 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Remove more QByteArray<->QString conversionsKent Hansen2011-09-291-4/+4
| | | | | | | | | | Prefer to store types as QStrings. It's only when we manipulate raw (compiled, meta-)data that utf conversion is needed. Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb Reviewed-on: http://codereview.qt-project.org/5781 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* qmlplugindump: Describe meta object revisions of exported types.Christian Kamm2011-09-211-12/+25
| | | | | | | | Adds the exportMetaObjectRevisions property to generated qmltypes files. Change-Id: Iafe2fe408c88bb6dd02cbb558404a5f654431248 Reviewed-on: http://codereview.qt-project.org/5311 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-08-311-0/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * qmlplugindump: Load QtQuick 1 plugin.Christian Kamm2011-08-291-0/+13
| | | | | | | | | | | | | | | | | | This allows the QtQuick1 types to be dumped with --builtin and to be skipped when dumping other plugins that use them. Change-Id: I23ecba5cea7c11e998861746f1c7056e8911abf3 Reviewed-on: http://codereview.qt.nokia.com/3650 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>