diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:03:51 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:03:51 +0200 |
| commit | 7eb201e83514c5c949fcf0f8beebe7858c2d1ace (patch) | |
| tree | bcbf3e2a449fd853050131ccf3360fef326afe97 /src/designer/src/lib/sdk/abstractwidgetbox.h | |
| parent | cbb56d8dab2447ce8fda454e6c6cd6938dffacb1 (diff) | |
| parent | 99f449410c680142e58bf6cdd56c583b2c57b9b6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Idd890e296d820cbe335798d33e8592b9015b2a4a
Diffstat (limited to 'src/designer/src/lib/sdk/abstractwidgetbox.h')
| -rw-r--r-- | src/designer/src/lib/sdk/abstractwidgetbox.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index 7d7600e5b..06de2016c 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -71,6 +71,10 @@ public: QSharedDataPointer<QDesignerWidgetBoxWidgetData> m_data; }; +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + using WidgetList = QList<Widget>; +#endif + class Category { public: enum Type { Default, Scratchpad }; |