diff options
| -rw-r--r-- | src/imports/layouts/qquickstacklayout_p.h | 4 | ||||
| -rw-r--r-- | tools/qmllint/findwarnings.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/imports/layouts/qquickstacklayout_p.h b/src/imports/layouts/qquickstacklayout_p.h index b641376ed8..a10f85ce43 100644 --- a/src/imports/layouts/qquickstacklayout_p.h +++ b/src/imports/layouts/qquickstacklayout_p.h @@ -92,12 +92,12 @@ private: QList<QQuickItem*> m_items; - typedef struct { + struct SizeHints { inline QSizeF &min() { return array[Qt::MinimumSize]; } inline QSizeF &pref() { return array[Qt::PreferredSize]; } inline QSizeF &max() { return array[Qt::MaximumSize]; } QSizeF array[Qt::NSizeHints]; - } SizeHints; + }; mutable QVector<SizeHints> m_cachedItemSizeHints; mutable QSizeF m_cachedSizeHints[Qt::NSizeHints]; diff --git a/tools/qmllint/findwarnings.h b/tools/qmllint/findwarnings.h index f60a003a4d..bf3fd0015e 100644 --- a/tools/qmllint/findwarnings.h +++ b/tools/qmllint/findwarnings.h @@ -98,6 +98,10 @@ private: void throwRecursionDepthError() override; + // work around compiler error in clang11 + using QQmlJSImportVisitor::visit; + using QQmlJSImportVisitor::endVisit; + // start block/scope handling bool visit(QQmlJS::AST::ExpressionStatement *ast) override; void endVisit(QQmlJS::AST::ExpressionStatement *ast) override; |