From bb1eb0fa1010e937e20cb3b8271991b47ebeaef8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 10 Apr 2016 11:24:56 +0200 Subject: [PATCH] autotest: fix compilation with Qt 5.4 --- autotests/kselectionproxymodeltest.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/autotests/kselectionproxymodeltest.cpp b/autotests/kselectionproxymodeltest.cpp index b871ad3..fbc26d8 100644 --- a/autotests/kselectionproxymodeltest.cpp +++ b/autotests/kselectionproxymodeltest.cpp @@ -842,7 +842,11 @@ void KSelectionProxyModelTest::removeRows() ); resetCommand.doCommand(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) QItemSelectionModel selectionModel; +#else + QItemSelectionModel selectionModel(&tree); +#endif if (emulateSingleSelectionMode) { @@ -862,13 +866,19 @@ void KSelectionProxyModelTest::removeRows() proxy.setFilterBehavior(static_cast(kspm_mode)); if (connectSelectionModelFirst) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) selectionModel.setModel(&tree); +#endif proxy.setSourceModel(&tree); proxy.setSelectionModel(&selectionModel); } else { proxy.setSourceModel(&tree); proxy.setSelectionModel(&selectionModel); +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) selectionModel.setModel(&tree); +#else + QSKIP("No QItemSelectionModel::setModel in Qt 5.4", SkipSingle); +#endif } QSignalSpy beforeSpy(&proxy, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)));