From 976f4dfabef2836fa37a8e86dc6cd1f33df7864c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 11 Apr 2016 15:26:57 +0200 Subject: [PATCH] ActivityWidget: Fix Qt4 build Don't use API added in Qt5 --- src/gui/activitywidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp index a15c2f7895..c61abb7571 100644 --- a/src/gui/activitywidget.cpp +++ b/src/gui/activitywidget.cpp @@ -251,7 +251,9 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list) _notificationsLayout->addWidget(widget); // _ui->_notifyScroll->setMinimumHeight( widget->height()); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) _ui->_notifyScroll->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow); +#endif _widgetForNotifId[activity.ident()] = widget; } @@ -559,7 +561,7 @@ void ActivitySettings::slotShowIssueItemCount(int cnt) //: %1 is the number of not synced files. cntText = tr("Not Synced (%1)").arg(cnt); } - _tab->tabBar()->setTabText(_syncIssueTabId, cntText); + _tab->setTabText(_syncIssueTabId, cntText); } void ActivitySettings::slotCopyToClipboard()