diff options
| author | Tuomo Pelkonen <tuomo.pelkonen@qt.io> | 2021-09-06 10:45:24 +0300 |
|---|---|---|
| committer | Tuomo Pelkonen <tuomo.pelkonen@qt.io> | 2021-09-08 07:48:55 +0300 |
| commit | 1a85f784132f83211de431193d72cdf1e850f778 (patch) | |
| tree | 5d55ac90b651228c20ce7f4d04873db0b20238c7 /src/qml/debugger | |
| parent | 68d98e25bde44c22298f92ef4e30440152297e71 (diff) | |
Add all qml debug translation fixes and functionalities from 5.15
* Add current state name in the protocol
* Get style name in correct format
* Get correct root item after changing new file
Task-number: QTBUG-96052
Pick-to: 6.2
Change-Id: I5a7b9e29ec83e6258505cedbd55edf376386f783
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmldebugtranslationprotocol_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmldebugtranslationprotocol_p.h b/src/qml/debugger/qqmldebugtranslationprotocol_p.h index e822206ef5..b60da720fd 100644 --- a/src/qml/debugger/qqmldebugtranslationprotocol_p.h +++ b/src/qml/debugger/qqmldebugtranslationprotocol_p.h @@ -239,7 +239,7 @@ public: >> qmlElement.propertyName >> qmlElement.translationId >> qmlElement.translatedText >> qmlElement.fontFamily >> qmlElement.fontPointSize >> qmlElement.fontPixelSize >> qmlElement.fontStyleName >> qmlElement.horizontalAlignment - >> qmlElement.verticalAlignment; + >> qmlElement.verticalAlignment >> qmlElement.stateName; } friend QDataStream &operator<<(QDataStream &stream, const QmlElement &qmlElement) @@ -249,7 +249,7 @@ public: << qmlElement.translatedText << qmlElement.fontFamily << qmlElement.fontPointSize << qmlElement.fontPixelSize << qmlElement.fontStyleName << qmlElement.horizontalAlignment - << qmlElement.verticalAlignment; + << qmlElement.verticalAlignment << qmlElement.stateName; } CodeMarker codeMarker; @@ -261,10 +261,12 @@ public: QString elementId; QString elementType; qreal fontPointSize = 0.0; + QString stateName; int fontPixelSize = 0; int horizontalAlignment = 0; int verticalAlignment = 0; }; + class QmlState { public: |