diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 11:15:20 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-12 11:15:20 +0000 |
| commit | 3d31afe1e4a8b0a8a2080b0377f80c92bea666c4 (patch) | |
| tree | 179e949de578461e7f62c4b44ee334aebaf2c734 /src/widgets/widgets/qdockwidget_p.h | |
| parent | f104d5273721c19257e0b0f38978d4112b2e3e5d (diff) | |
| parent | 8dd22d9255287bad17823d8738ac05dbffca33ab (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets/qdockwidget_p.h')
| -rw-r--r-- | src/widgets/widgets/qdockwidget_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index e35fd17fc2..766e4ed161 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -99,6 +99,8 @@ public: QDockWidget::DockWidgetFeatures features; Qt::DockWidgetAreas allowedAreas; + QFont font; + #ifndef QT_NO_ACTION QAction *toggleViewAction; #endif |