From dd96e919c1a69f40329c5b6a33029ab559636397 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Tue, 12 Oct 2021 13:38:44 +0200
Subject: Qmldebugtranslator: report elide issues correctly inside layouts

Task-number: QTBUG-96991
Pick-to: 6.2
Change-Id: I911044893fb6eac54c6fb8f2b236f422bd04a7ae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/qml/debugger/qqmldebugserviceinterfaces_p.h   |  2 --
 src/qml/debugger/qqmldebugtranslationprotocol_p.h | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/qml')

diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
index 5d58e4d2e0..d01e472edb 100644
--- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h
+++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
@@ -108,7 +108,6 @@ class QQmlEngineControlService {};
 class QQmlNativeDebugService {};
 class QQmlDebugTranslationService {
 public:
-    virtual QString foundElidedText(QObject *, const QString &, const QString &) {return {};}
     virtual void foundTranslationBinding(const TranslationBindingInformation &) {}
 };
 
@@ -186,7 +185,6 @@ class Q_QML_PRIVATE_EXPORT QQmlDebugTranslationService : public QQmlDebugService
 public:
     static const QString s_key;
 
-    virtual QString foundElidedText(QObject *qQuickTextObject, const QString &layoutText, const QString &elideText) = 0;
     virtual void foundTranslationBinding(const TranslationBindingInformation &translationBindingInformation) = 0;
 protected:
     friend class QQmlDebugConnector;
diff --git a/src/qml/debugger/qqmldebugtranslationprotocol_p.h b/src/qml/debugger/qqmldebugtranslationprotocol_p.h
index b60da720fd..70cb2163c8 100644
--- a/src/qml/debugger/qqmldebugtranslationprotocol_p.h
+++ b/src/qml/debugger/qqmldebugtranslationprotocol_p.h
@@ -64,19 +64,23 @@ enum class Request {
     ChangeLanguage = 1,
     StateList,
     ChangeState,
-    MissingTranslations,
+    TranslationIssues,
     TranslatableTextOccurrences,
     WatchTextElides,
     DisableWatchTextElides,
+    // following are obsolete, just provided for compilation compatibility
+    MissingTranslations
 };
 
 enum class Reply {
     LanguageChanged = 101,
     StateList,
     StateChanged,
-    MissingTranslations,
+    TranslationIssues,
     TranslatableTextOccurrences,
-    TextElided,
+    // following are obsolete, just provided for compilation compatibility
+    MissingTranslations,
+    TextElided
 };
 
 inline QDataStream &operator<<(QDataStream &ds, Request r)
@@ -124,6 +128,12 @@ inline QByteArray createMissingTranslationsRequest(QDataStream &packet)
     return qobject_cast<QBuffer *>(packet.device())->data();
 }
 
+inline QByteArray createTranslationIssuesRequest(QDataStream &packet)
+{
+    packet << Request::TranslationIssues;
+    return qobject_cast<QBuffer *>(packet.device())->data();
+}
+
 inline QByteArray createTranslatableTextOccurrencesRequest(QDataStream &packet)
 {
     packet << Request::TranslatableTextOccurrences;
-- 
cgit v1.2.3