aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlplugindump/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* | Compile with refactorGunnar Sletta2011-08-011-1/+1
|/ | | | | | Change-Id: I41119370bd4823dcdfe5d4e2521d18b8d6ba8be3 Reviewed-on: http://codereview.qt.nokia.com/2417 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* qmldump: Fix creation of objects from QDeclarativeTypes.Christian Kamm2011-07-201-14/+23
| | | | | | | | | | | | | | Previously, the import statement was not necessarily set up correctly for the type we wanted to instantiate. We simply use QDeclarativeType::create now and thus can skip finding the right import. Mirrors qtcreator/f326bd067d455e979b5d83195e19581a9e2fd494 Mirrors qt4.8/bdbc3ff0a32bb37a32dc4825413e60f9d75e5007 Change-Id: Ic9e652b341854941c0e6a51f49f23dfaae4f87d7 Reviewed-on: http://codereview.qt.nokia.com/1648 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-7/+5
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-081-17/+17
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* qmlplugindump: Improve error message for misbehaving plugin components.Christian Kamm2011-06-301-2/+8
| | | | | | | | | | | | Mirrors 6244008dcb43dde15dea3becbbec07d941b4759c in Qt Creator/2.3. (cherry picked from commit a39e975465a5dc0548891ccd93c4ff04165b60cd) Change-Id: I995eebe065ecf8b4f185d61987240f39ad11b57f Reviewed-on: http://codereview.qt.nokia.com/871 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* qmlplugindump: Change to QtQuick 2.0 import.Christian Kamm2011-06-291-1/+1
| | | | | | | | To be future-proof should QtQuick 1.0 ever go away. Change-Id: I9bf46bc9f60f5ff61deb60fa2ffa90ea89c9c8d5 Reviewed-on: http://codereview.qt.nokia.com/899 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* qmlplugindump: Fix dumping with -path on Mac.Christian Kamm2011-06-291-2/+10
| | | | | | | | | | | | | | | | | | If the current working directory was a direct parent of the qmldir path the exported modules had the path as the module URI on macs. Also changes the QtQuick export back to 1.0 to make it work with Qt 4.7.3. The version of that import statement does not actually matter as long as it's valid. Mirrors a change in Qt Creator: http://codereview.qt.nokia.com/896 (cherry picked from commit d7ab0007d4b051f3cf12f01157b8b78d2fddf7c8) Change-Id: Ib8caa8eda7f237b10e82df3afd560c118427aa8f Reviewed-on: http://codereview.qt.nokia.com/897 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* qmldump: Fix export comparison.Christian Kamm2011-06-281-1/+1
| | | | | | | | | | | | | Compare the full uri/name, not just the uri. Also QDeclarativeType::module was not available in 4.7.3. Mirrors http://codereview.qt.nokia.com/759 (cherry picked from commit a0bd8d2dc68fdf993821b5eb881769448b34dffd) Change-Id: Ib66ec79b929bd29e3aa27a1b70e5a5c1ec2d51e5 Reviewed-on: http://codereview.qt.nokia.com/762 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* qmlplugindump: For extended types, remove exports of the base object.Christian Kamm2011-06-231-20/+27
| | | | | Reviewed-by: Kai Koehne (cherry picked from commit 21af9f0be1dd0d9be6c3767074fdfbd54e3b8372)
* qmlplugindump: Add -v option.Christian Kamm2011-06-211-23/+40
| | | | | Reviewed-by: Kai Koehne (cherry picked from commit 9b09ef514bb6c4c926440e3fbf19d7255f97a12f)
* qmlplugindump: Fix emitted tooling version.Christian Kamm2011-06-211-2/+2
| | | | | | | Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1. Reviewed-by: Kai Koehne (cherry picked from commit 9f0fda822aec47da201ae79e6bc807294196a8a2)
* qmlplugindump: Bump QtQuick.tooling version to 1.1.Christian Kamm2011-05-301-1/+1
| | | | | | | | Mirrors a change to qmlplugindump in qtcreator/715cee76a9e46efb7f8245004aaa8a1c47b1618d Reviewed-by: Kai Koehne (cherry picked from commit 10f16bc55b9e5535bc3353260f97a32e18d70cf1)
* qmlplugindump: Dump revision property.Christian Kamm2011-05-301-0/+9
| | | | | | | | Mirrors a change to qmldump in qt-creator/6e3274240077fc356a37d3de735b3b2da9654d2e Reviewed-by: Roberto Raggi (cherry picked from commit b0392d398e2f28682cdce6e85546d38a838440f7)
* qmlplugindump: Fix --path usage with drive letters on Windows.Christian Kamm2011-04-281-5/+6
| | | | | | | | | | Since we can't import by such a path, we instead use a "." import and set the uri of the component to the correct path. Mirrors a change to qmldump in qt-creator/0c8b4e38fab1862e3427aac7e7db68623bc7f174 Reviewed-by: Thomas Hartmann
* Initial import from qtquick2.Qt by Nokia2011-04-271-0/+597
Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 22:10:03 +0000