diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-03 12:54:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-03 21:29:45 +0100 |
| commit | 053394edab2e4bbe655a3a436e7c4b1257deb7da (patch) | |
| tree | 11da5ecf04c925c49fffce33e69d3e03270ed0d9 /src/quick/items/qquicktextedit.cpp | |
| parent | c279669c7237e63ca8b6459d92e684e2c960a05e (diff) | |
QtQuick: Fix conflicting definition of ProtectedLayoutAccessor in CMake Unity (Jumbo) builds
Move it to qquicktextdocument_p.h in namespace QtPrivate.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I7b0482e0dc052dc431c1264ff27423957d20b219
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 191a33167f..69feed802f 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -101,15 +101,6 @@ static const int nodeBreakingSize = 300; const int QQuickTextEditPrivate::largeTextSizeThreshold = QQUICKTEXT_LARGETEXT_THRESHOLD; namespace { - class ProtectedLayoutAccessor: public QAbstractTextDocumentLayout - { - public: - inline QTextCharFormat formatAccessor(int pos) - { - return format(pos); - } - }; - class RootNode : public QSGTransformNode { public: @@ -2199,7 +2190,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * node = d->createTextNode(); updateNodeTransform(node, d->document->documentLayout()->frameBoundingRect(textFrame).topLeft()); const int pos = textFrame->firstPosition() - 1; - ProtectedLayoutAccessor *a = static_cast<ProtectedLayoutAccessor *>(d->document->documentLayout()); + auto *a = static_cast<QtPrivate::ProtectedLayoutAccessor *>(d->document->documentLayout()); QTextCharFormat format = a->formatAccessor(pos); QTextBlock block = textFrame->firstCursorPosition().block(); nodeOffset = d->document->documentLayout()->blockBoundingRect(block).topLeft(); |