diff options
author | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
commit | 096e37910d93f9c52976600e985c615ea36fe291 (patch) | |
tree | 713d020f4a04f03d8ca6e111055e7eebe85953a8 /tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | |
parent | Revert "qsimd: remove support for systems without 64-bit atomics" (diff) | |
parent | Examples: Cleanup and modernize Plug&Paint (diff) | |
download | qtbase-096e37910d93f9c52976600e985c615ea36fe291.tar.xz qtbase-096e37910d93f9c52976600e985c615ea36fe291.zip |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/kernel/qeventdispatcher_cf.mm
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/qioseventdispatcher.mm
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsinternalmimedata.h
src/plugins/platforms/windows/qwindowsmime.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
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 a58202e636..1de6f90410 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() { |