philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtquick: Fix crash when dereferencing incomplete stack controler

Browse Source 
The stack controller CTOR was still in the stack (pun intended), then
dereferenced by tabbar. Instead, call Stack_qtquick::init() to intitialize
the the TabBar. At this point the Stack controller is already usable.
This commit is contained in:
Sergio Martins
2022-06-04 21:30:43 +01:00
parent ec144472ce
commit 56ca80e8fc
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qtquick/views/Stack_qtquick.h
View File

@@ -43,7 +43,7 @@ class DOCKS_EXPORT Stack_qtquick
{
Q_OBJECT
Q_PROPERTY(DockWidgetModel *dockWidgetModel READ dockWidgetModel CONSTANT)
Q_PROPERTY(QObject *tabBar READ tabBarViewObj CONSTANT)
Q_PROPERTY(QObject *tabBar READ tabBarViewObj NOTIFY tabBarChanged)
public:
explicit Stack_qtquick(Controllers::Stack *controller,
@@ -64,21 +64,27 @@ public:
/// As the base class is not a QObject.
QObject *tabBarViewObj() const;
/// @brief Returns the stack controller associated with this view
Controllers::Stack *stack() const;
Q_SIGNALS: // TODOm2: Review these signals
void currentTabChanged(int index);
void currentDockWidgetChanged(KDDockWidgets::Controllers::DockWidget *dw);
void countChanged();
void tabBarChanged();
protected:
bool isPositionDraggable(QPoint p) const override;
void setTabBarAutoHide(bool) override;
void renameTab(int index, const QString &) override;
void changeTabIcon(int index, const QIcon &) override;
void init() override;
private:
Q_DISABLE_COPY(Stack_qtquick)
DockWidgetModel *const m_dockWidgetModel;
Controllers::TabBar *const m_tabBar;
Controllers::TabBar *m_tabBar = nullptr;
Controllers::Stack *const m_stack;
Controllers::DockWidget *m_currentDockWidget = nullptr;
};