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>
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>
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
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>
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>
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>
Mirrors a change to qmlplugindump in
qtcreator/715cee76a9e46efb7f8245004aaa8a1c47b1618d
Reviewed-by: Kai Koehne
(cherry picked from commit 10f16bc55b9e5535bc3353260f97a32e18d70cf1)
Mirrors a change to qmldump in
qt-creator/6e3274240077fc356a37d3de735b3b2da9654d2e
Reviewed-by: Roberto Raggi
(cherry picked from commit b0392d398e2f28682cdce6e85546d38a838440f7)
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
Christian Kamm
Martin Jones
Jyri Tahtela
Qt by Nokia