diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-23 11:16:23 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-23 09:33:53 +0000 |
| commit | 2f24150b03a8141b3e64442bcfcc08448b9a79e5 (patch) | |
| tree | d742b17e50d24b82f7e5e58a04abf6c7a73cb4c2 /src/quick/items/qquickitemsmodule.cpp | |
| parent | c8c2db3f5b157131542025ce556d248c7a916a00 (diff) | |
Add a feature for Drag&Drop support in Qt Quick
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>
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 2a1c442653..eaad06e0c4 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -110,8 +110,10 @@ #include "qquickshadereffect_p.h" #include "qquickshadereffectmesh_p.h" #endif +#if QT_CONFIG(quick_draganddrop) #include "qquickdrag_p.h" #include "qquickdroparea_p.h" +#endif #include "qquickmultipointtoucharea_p.h" #include <QtQuick/private/qquickaccessibleattached_p.h> @@ -305,7 +307,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickPathInterpolator>("QtQuick",2,0,"PathInterpolator"); #endif -#if QT_CONFIG(draganddrop) +#if QT_CONFIG(quick_draganddrop) qmlRegisterType<QQuickDropArea>("QtQuick", 2, 0, "DropArea"); qmlRegisterType<QQuickDropEvent>(); qmlRegisterType<QQuickDropAreaDrag>(); |