Commit Graph

172 Commits

Author SHA1 Message Date
Andrew den Exter c825865cdd Add DropArea item and Drag attached property.
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>
2011-10-10 05:48:01 +02:00
Christian Kamm a6393f953e qmlplugindump: Don't dump implicit signals.
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>
2011-10-06 12:19:51 +02:00
Christian Kamm 121c32b54a qmlplugindump: Explicitly add QSGMouseEvent to be dumped.
Change-Id: I93f29f151e82a3d47fb10ff587fe28ea27a2d7b4
Reviewed-on: http://codereview.qt-project.org/6143
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-10-06 12:19:43 +02:00
Kent Hansen bcc9a4b3d1 Remove more QByteArray<->QString conversions
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>
2011-09-29 14:59:15 +02:00
Christian Kamm 26e15e877f qmlplugindump: Describe meta object revisions of exported types.
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>
2011-09-21 15:28:01 +02:00
Gunnar Sletta 7147835237 Merge branch 'master' into refactor
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
2011-08-31 08:55:16 +02:00
Christian Kamm 438639f9c4 qmlplugindump: Load QtQuick 1 plugin.
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>
2011-08-29 08:26:23 +02:00
Gunnar Sletta a61337b33a Compile with refactor
Change-Id: I41119370bd4823dcdfe5d4e2521d18b8d6ba8be3
Reviewed-on: http://codereview.qt.nokia.com/2417
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-01 07:33:56 +02:00
Christian Kamm 5d1eddc6cf qmldump: Fix creation of objects from QDeclarativeTypes.
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>
2011-07-20 03:25:59 +02:00
Martin Jones 4442dea01b Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-07-12 06:38:09 +02:00
Jyri Tahtela 5a705d8951 Update licenseheader text in source files for qtdeclarative Qt module
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>
2011-07-08 02:45:03 +02:00
Christian Kamm 6feeee85f0 qmlplugindump: Improve error message for misbehaving plugin components.
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>
2011-06-30 09:02:11 +02:00
Christian Kamm f14cb788bd qmlplugindump: Change to QtQuick 2.0 import.
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>
2011-06-29 15:08:17 +02:00
Christian Kamm 0304a87859 qmlplugindump: Fix dumping with -path on Mac.
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>
2011-06-29 15:08:09 +02:00
Christian Kamm cf3a3c397f qmldump: Fix export comparison.
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>
2011-06-28 12:27:01 +02:00
Christian Kamm a5c0b25f28 qmlplugindump: For extended types, remove exports of the base object.
Reviewed-by: Kai Koehne
(cherry picked from commit 21af9f0be1dd0d9be6c3767074fdfbd54e3b8372)
2011-06-23 10:48:09 +02:00
Christian Kamm ce03486bc6 qmlplugindump: Add -v option.
Reviewed-by: Kai Koehne
(cherry picked from commit 9b09ef514bb6c4c926440e3fbf19d7255f97a12f)
2011-06-21 13:16:30 +02:00
Christian Kamm e53aab11e4 qmlplugindump: Fix emitted tooling version.
Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1.

Reviewed-by: Kai Koehne
(cherry picked from commit 9f0fda822aec47da201ae79e6bc807294196a8a2)
2011-06-21 13:16:21 +02:00
Christian Kamm 3fb35b37a0 qmlplugindump: Bump QtQuick.tooling version to 1.1.
Mirrors a change to qmlplugindump in
qtcreator/715cee76a9e46efb7f8245004aaa8a1c47b1618d

Reviewed-by: Kai Koehne
(cherry picked from commit 10f16bc55b9e5535bc3353260f97a32e18d70cf1)
2011-05-30 11:35:46 +02:00
Christian Kamm 609c3920cd qmlplugindump: Dump revision property.
Mirrors a change to qmldump in
qt-creator/6e3274240077fc356a37d3de735b3b2da9654d2e

Reviewed-by: Roberto Raggi
(cherry picked from commit b0392d398e2f28682cdce6e85546d38a838440f7)
2011-05-30 11:25:51 +02:00
Christian Kamm 3904e604f4 qmlplugindump: Fix --path usage with drive letters on Windows.
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
2011-04-28 12:27:00 +02:00
Qt by Nokia a129444bb0 Initial import from qtquick2.
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 14:40:44 +02:00