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 /tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | |
| 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 'tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp')
| -rw-r--r-- | tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 4c637573d0..1ea1843abe 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -37,7 +37,7 @@ using namespace QTestPrivate; -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) Q_DECLARE_METATYPE(QAbstractItemView::DragDropMode) #endif Q_DECLARE_METATYPE(QAbstractItemView::EditTriggers) @@ -76,7 +76,7 @@ private slots: void alternatingRowColors(); void currentIndex_data(); void currentIndex(); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) void dragDropMode_data(); void dragDropMode(); void dragDropModeFromDragEnabledAndAcceptDrops_data(); @@ -440,7 +440,7 @@ void tst_QTreeView::construction() // QAbstractItemView properties QVERIFY(!view.alternatingRowColors()); QCOMPARE(view.currentIndex(), QModelIndex()); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QCOMPARE(view.dragDropMode(), QAbstractItemView::NoDragDrop); QVERIFY(!view.dragDropOverwriteMode()); QVERIFY(!view.dragEnabled()); @@ -463,7 +463,7 @@ void tst_QTreeView::construction() QCOMPARE(view.selectionBehavior(), QAbstractItemView::SelectRows); QCOMPARE(view.selectionMode(), QAbstractItemView::SingleSelection); QVERIFY(!view.selectionModel()); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QVERIFY(view.showDropIndicator()); #endif QCOMPARE(view.QAbstractItemView::sizeHintForColumn(-1), -1); // <- protected in QTreeView @@ -573,7 +573,7 @@ void tst_QTreeView::currentIndex() // ### Test child and grandChild indexes. } -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) void tst_QTreeView::dragDropMode_data() { |