From fb5f28ff73488d5d877dbca595bc1f7f50d68545 Mon Sep 17 00:00:00 2001 From: xust Date: Fri, 22 Nov 2024 13:32:54 +0800 Subject: [PATCH] fix: adjust the order of new added vfunc and version bump avoid an ABI issue. Log: as above. --- debian/changelog | 8 ++++++-- include/dfm-base/interfaces/abstractbaseview.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a50405544e..a99af2543e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -dde-file-manager (6.5.10) UNRELEASED; urgency=medium +dde-file-manager (6.5.10) unstable; urgency=medium + [ zhangsheng ] * desktop adapt to Qt6.8 - -- zhangsheng Thu, 21 Nov 2024 17:11:48 +0800 + [ XuShitong ] + * fix AbstractBaseView ABI issue. + + -- XuShitong Fri, 22 Nov 2024 13:35:06 +0800 dde-file-manager (6.5.9) unstable; urgency=medium diff --git a/include/dfm-base/interfaces/abstractbaseview.h b/include/dfm-base/interfaces/abstractbaseview.h index b7926079a5..7418270101 100644 --- a/include/dfm-base/interfaces/abstractbaseview.h +++ b/include/dfm-base/interfaces/abstractbaseview.h @@ -26,13 +26,13 @@ class AbstractBaseView void deleteLater(); virtual QWidget *widget() const = 0; - virtual QWidget *contentWidget() const; virtual QUrl rootUrl() const = 0; virtual ViewState viewState() const; virtual bool setRootUrl(const QUrl &url) = 0; virtual QList toolBarActionList() const; virtual QList selectedUrlList() const; virtual void refresh(); + virtual QWidget *contentWidget() const; protected: void notifyStateChanged();