diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-13 09:01:43 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-29 18:31:35 +0000 |
| commit | 9f27bfb31acfba49a74a342d9249f24633a7ade2 (patch) | |
| tree | b156192def25d688ff924b60f1c8defadd86c351 /src/gui/itemmodels | |
| parent | dd8e73504edbf71808d6585b7a08daddcdcbf18e (diff) | |
Make sure we can build with -no-feature-draganddrop
We move QInternalMimeData to a separate file, because this class is
used, even if draganddrop is disabled. From now on, include
qinternalmimedata_p.h instead of qdnd_p.h for QInternalMimeData.
Change-Id: I594e08e2e90d574dc445119091686b4b69e4731b
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/gui/itemmodels')
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 4 | ||||
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index c340bddc51..f55e90c153 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -1414,7 +1414,7 @@ void QStandardItem::setTristate(bool tristate) } #endif -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) /*! Sets whether the item is drag enabled. If \a dragEnabled is true, the item @@ -1472,7 +1472,7 @@ void QStandardItem::setDropEnabled(bool dropEnabled) \sa setDropEnabled(), isDragEnabled(), flags() */ -#endif // QT_NO_DRAGANDDROP +#endif // QT_CONFIG(draganddrop) /*! Returns the row where the item is located in its parent's child table, or diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index d1c04d6b51..827179b31d 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -179,7 +179,7 @@ public: QT_DEPRECATED void setTristate(bool tristate); #endif -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) inline bool isDragEnabled() const { return (flags() & Qt::ItemIsDragEnabled) != 0; } @@ -189,7 +189,7 @@ public: return (flags() & Qt::ItemIsDropEnabled) != 0; } void setDropEnabled(bool dropEnabled); -#endif // QT_NO_DRAGANDDROP +#endif // QT_CONFIG(draganddrop) QStandardItem *parent() const; int row() const; |