qt/qtdeclarative.git/src/quick/items/qquickdrag.cpp, branch wip/cmake Qt Declarative (Quick 2) Add major version to all Q_REVISIONs 2020-02-19T14:48:27+00:00 Ulf Hermann ulf.hermann@qt.io 2020-01-16T12:42:11+00:00 ddde036f6a5781dc0481fae293bd387b3344171a Change-Id: Id72fbe10c16de61bd847773d0055d83cfe03f63c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Change-Id: Id72fbe10c16de61bd847773d0055d83cfe03f63c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Merge remote-tracking branch 'origin/5.14' into 5.15 2019-11-07T06:17:40+00:00 Liang Qi liang.qi@qt.io 2019-11-07T06:17:40+00:00 50bce248ab6ec4d1e39b85029297dc5d5d80f195 Conflicts: tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp tests/auto/quick/qquickloader/tst_qquickloader.cpp Change-Id: I85fd38cfa00cd60197a1c981bfcc16fcb896cfe9 
 Conflicts:
	tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
	tests/auto/quick/qquickloader/tst_qquickloader.cpp

Change-Id: I85fd38cfa00cd60197a1c981bfcc16fcb896cfe9
Merge remote-tracking branch 'origin/5.13' into 5.14 2019-10-31T08:44:09+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2019-10-31T00:01:32+00:00 9c050d452961f348c8bcc33e3422aed6316bb18b Conflicts: .qmake.conf src/qml/common/qv4compileddata_p.h src/qml/types/qqmlbind.cpp tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp Change-Id: I6a137907e63445f17a3d6181b832a6bd76135bb2 
 Conflicts:
	.qmake.conf
	src/qml/common/qv4compileddata_p.h
	src/qml/types/qqmlbind.cpp
	tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp

Change-Id: I6a137907e63445f17a3d6181b832a6bd76135bb2
QML Drag: Prevent crash when using image provider url 2019-10-30T08:17:36+00:00 Fabian Kosmale fabian.kosmale@qt.io 2019-10-29T15:11:21+00:00 234dbbf25567ce44a8c8e099d003f04a12f2b371 For attached property objects, qmlEngine will not return an engine. However, QQuickDragAttached's parent is the object to which it is attached, and from that one we can get the engine. Fixes: QTBUG-72045 Change-Id: I40748dd11ea3eb4604c37e932b2cfd3baad6fd1f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> 
For attached property objects, qmlEngine will not return an engine.
However, QQuickDragAttached's parent is the object to which it is
attached, and from that one we can get the engine.

Fixes: QTBUG-72045
Change-Id: I40748dd11ea3eb4604c37e932b2cfd3baad6fd1f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Merge remote-tracking branch 'origin/5.14' into 5.15 2019-10-04T09:29:16+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2019-10-03T23:00:22+00:00 9c7121df1579d38c7f4136da6146d7acae8fedcc Conflicts: src/imports/qtquick2/plugins.qmltypes src/quick/items/qquickitemsmodule.cpp Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5 
 Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/quick/items/qquickitemsmodule.cpp

Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5
Specify parameters of type registration in class declarations 2019-09-26T10:32:17+00:00 Ulf Hermann ulf.hermann@qt.io 2019-08-21T16:34:21+00:00 cc1a604c704f848927b3fa0a97b0a50b0b79d2a4 Using this technique we can automatically register all necessary revisions and minor versions of a type, using the metaobject system. This greatly reduces the potential for mistakes and resulting incompatibilities between versions of imports. We assume that for each type we need to register all revisions of its super types and its attached type, and that the revisions match. That is, if you import version X of type A, you will also get version X of its attached type and of any super types. As we previously didn't take these dependencies into account when manually registering the types, a number of extra revisions are now registered for some types. Potentially, we can now generate the qmltypes files at compile time, using moc. Change-Id: I7abb8a5c39f5e63ad1a0cb41a783f2c91909491b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Using this technique we can automatically register all necessary
revisions and minor versions of a type, using the metaobject system.
This greatly reduces the potential for mistakes and resulting
incompatibilities between versions of imports.

We assume that for each type we need to register all revisions of its
super types and its attached type, and that the revisions match. That
is, if you import version X of type A, you will also get version X of
its attached type and of any super types. As we previously didn't take
these dependencies into account when manually registering the types, a
number of extra revisions are now registered for some types.

Potentially, we can now generate the qmltypes files at compile time,
using moc.

Change-Id: I7abb8a5c39f5e63ad1a0cb41a783f2c91909491b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge remote-tracking branch 'origin/5.13' into 5.14 2019-09-12T06:01:21+00:00 Liang Qi liang.qi@qt.io 2019-09-12T06:01:21+00:00 c80eb38354854f2ccc7ea070a9857409acc36792 Conflicts: src/qml/jsruntime/qv4engine.cpp src/quick/handlers/qquicktaphandler.cpp src/quick/items/qquicktableview.cpp Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io> Done-With: Ulf Hermann <ulf.hermann@qt.io> Done-With: Shawn Rutledge <shawn.rutledge@qt.io> Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd 
 Conflicts:
	src/qml/jsruntime/qv4engine.cpp
	src/quick/handlers/qquicktaphandler.cpp
	src/quick/items/qquicktableview.cpp

Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd
Doc: Fix documentation warnings for qtdeclarative 2019-08-29T11:04:58+00:00 Topi Reinio topi.reinio@qt.io 2019-07-18T13:18:31+00:00 1dc3f4c24583e14dee3c5fa650a8ac239b953458 After recent changes to QDoc, it now correctly warns about missing documentation for QML method parameters - fix all of these and also do some minor language editing. Remove duplicated entries for - \qmlmodule Qt.labs.qmlmodels - \group qtjavascript as they were causing issues. Change-Id: I55cd670cc8a0cc6427cdb7945dbd7c28ea94f796 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> 
After recent changes to QDoc, it now correctly warns about missing
documentation for QML method parameters - fix all of these and also
do some minor language editing.

Remove duplicated entries for
    - \qmlmodule Qt.labs.qmlmodels
    - \group qtjavascript

as they were causing issues.

Change-Id: I55cd670cc8a0cc6427cdb7945dbd7c28ea94f796
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Add a feature for Drag&Drop support in Qt Quick 2019-05-23T09:33:53+00:00 Ulf Hermann ulf.hermann@qt.io 2019-05-23T09:16:23+00:00 2f24150b03a8141b3e64442bcfcc08448b9a79e5 Even if we have drag&drop in QtGui we don't necessarily want it in QtQuick. Also, since the QQuickDropArea needs QRegularExpression, quick-draganddrop needs to depend on regularexpression. Change-Id: I623e910178160ad3e3af3c01c96c30e88dc1b7ba Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
Even if we have drag&drop in QtGui we don't necessarily want it in
QtQuick. Also, since the QQuickDropArea needs QRegularExpression,
quick-draganddrop needs to depend on regularexpression.

Change-Id: I623e910178160ad3e3af3c01c96c30e88dc1b7ba
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Remove unused includes of qv8engine_p.h 2019-04-09T09:40:47+00:00 Ulf Hermann ulf.hermann@qt.io 2019-04-05T07:58:31+00:00 96c4fffd8648e9c9fb95e8208a76933c8c2120bc Change-Id: Ic135a863581d29a3afb9c6c7f070d2630b3913b4 Reviewed-by: Lars Knoll <lars.knoll@qt.io> 
Change-Id: Ic135a863581d29a3afb9c6c7f070d2630b3913b4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>