aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlplugindump
Commit message (Collapse)AuthorAgeFilesLines
* Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-311-1/+1
| | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-08-312-1/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-1/+14
| | | | | | | | | | | | | | | | | | 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>
* Don't use QT_BUILD_TREE anymoreMarius Storm-Olsen2011-07-201-1/+1
| | | | | | | | It's only valid in QtBase now, and even there one should not use it. Change-Id: Ie3dae869b6523f6e2ef727771ae98e9b3f4678c3 Reviewed-on: http://codereview.qt.nokia.com/1838 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* qmlplugindump: Place executable in QT_BUILD_TREE/bin.Christian Kamm2011-07-121-1/+1
| | | | | | Change-Id: I751e8186aeaa2b87046cbe50c690cb0a312f71c5 Reviewed-on: http://codereview.qt.nokia.com/1306 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.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-083-51/+51
| | | | | | | | 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: Build debug version if possible.Christian Kamm2011-06-231-0/+17
| | | | | Done-with: owolff (cherry picked from commit 19b666195e293a71ef918f4a7f91d7f8be5f69bc)
* 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)
* added private headers to qmlplugindump.proGunnar Sletta2011-05-041-1/+1
|
* 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-275-0/+895
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 19:01:23 +0000