From 9679c48caec8221fbbbbb4d741d965b266fb41e7 Mon Sep 17 00:00:00 2001 From: Claus Assmann Date: Fri, 22 May 2015 06:54:26 +0100 Subject: [PATCH] Fix QT4.8 drag/drop update compile error .. Qt::NeverHasChildren is QT5 only .. Calling signal instead of notifier in Context --- src/AnalysisSidebar.cpp | 8 +++++++- src/IntervalTreeView.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/AnalysisSidebar.cpp b/src/AnalysisSidebar.cpp index 15ce8d668..4f5c5f995 100644 --- a/src/AnalysisSidebar.cpp +++ b/src/AnalysisSidebar.cpp @@ -216,7 +216,13 @@ AnalysisSidebar::setRide(RideItem*ride) QTreeWidgetItem *add = new QTreeWidgetItem(tree, interval->type); add->setText(0, interval->name); add->setData(0, Qt::UserRole, qVariantFromValue((void*)interval)); - add->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEditable | Qt::ItemNeverHasChildren); + add->setFlags(Qt::ItemIsEnabled +#if QT_VERSION > 0x50000 + | Qt::ItemNeverHasChildren +#endif + | Qt::ItemIsSelectable + | Qt::ItemIsDragEnabled + | Qt::ItemIsEditable); // set interval to not selected (just in case) interval->selected = false; diff --git a/src/IntervalTreeView.cpp b/src/IntervalTreeView.cpp index ed2f06cb3..d0706d21e 100644 --- a/src/IntervalTreeView.cpp +++ b/src/IntervalTreeView.cpp @@ -84,7 +84,7 @@ IntervalTreeView::dropEvent(QDropEvent* event) } if (change) { - context->intervalsUpdate(context->rideItem()); + context->notifyIntervalsUpdate(context->rideItem()); context->rideItem()->setDirty(true); }