diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-17 01:01:00 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-17 10:21:59 +0100 |
| commit | 3e758800b4daf8fbc870a2ff5d54fce9d4402ce8 (patch) | |
| tree | ba237b9da1c7dfd08bf13e71c5dbd6b3c2e77633 /src/quick/items/qquicktext.cpp | |
| parent | 925a0e499a5dbdb180fd9969a79abf96006ce4fd (diff) | |
| parent | 55546991e24ca6799709cbe0171b9ab87216c35f (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/qtqml/plugin.cpp
src/qml/qml/qqml.h
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmlmetatype_p.h
src/qml/qml/qqmltypeloader.cpp
src/qml/types/qqmlbind.cpp
src/quick/items/qquickitemsmodule.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: I52548938a582cb6510271ed4bc3a9aa0c3c11df6
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index f89e7d970f..816b48b190 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -40,6 +40,9 @@ #include "qquicktext_p.h" #include "qquicktext_p_p.h" +#include <private/qqmldebugserviceinterfaces_p.h> +#include <private/qqmldebugconnector_p.h> + #include <QtQuick/private/qsgcontext_p.h> #include <private/qqmlglobal_p.h> #include <private/qsgadaptationlayer_p.h> @@ -1146,6 +1149,10 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) elideLayout->setFont(layout.font()); elideLayout->setTextOption(layout.textOption()); + if (QQmlDebugTranslationService *service + = QQmlDebugConnector::service<QQmlDebugTranslationService>()) { + elideText = service->foundElidedText(q, layoutText, elideText); + } elideLayout->setText(elideText); elideLayout->beginLayout(); |