Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
2020-08-13 08:34:24 +02:00
parent 24ca17f714 dc870f538d
commit 4fe5b923cd
93 changed files with 3704 additions and 1066 deletions
--- a/src/plugins/qmlpreview/qmldebugtranslationclient.cpp
+++ b/src/plugins/qmlpreview/qmldebugtranslationclient.cpp
@@ -57,6 +57,14 @@ void QmlDebugTranslationClient::changeElidedTextWarningString(const QString &war
    sendMessage(packet.data());
 }

+void QmlDebugTranslationClient::changeElideWarning(bool elideWarning)
+{
+    if (elideWarning)
+        enableElidedTextWarning();
+    else
+        disableElidedTextWarning();
+}
+
 void QmlDebugTranslationClient::setDebugTranslationServiceLogFile(const QString &logFilePath)
 {
    QmlDebug::QPacket packet(dataStreamVersion());