diff options
| author | Ulf Hermann <[email protected]> | 2022-02-17 17:23:10 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2022-02-18 12:13:47 +0100 |
| commit | 795d7dafe5be5cd48aa8225a1343285b3aca2be7 (patch) | |
| tree | 0eeca097ec579458b5aa6ac9bfb8c411c48e3f0f /tests/auto/qml/qmlcppcodegen/data | |
| parent | 4c716dd19cf88349acc33eddae28c4e9222a3800 (diff) | |
QmlCompiler: Do not generate block comments into C++ code
The code we're commenting could again contain block comments. You cannot
nest them.
Pick-to: 6.2 6.3
Fixes: QTBUG-100978
Change-Id: I78685bf29dd30f05e5a3b17abc43ba0b4cb6849e
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Jan Arve Sæther <[email protected]>
Diffstat (limited to 'tests/auto/qml/qmlcppcodegen/data')
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/blockComments.qml | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt index 6afc186cad..1cfd0b493c 100644 --- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt @@ -35,6 +35,7 @@ set(qml_files asCast.qml attachedBaseEnum.qml bindToValueType.qml + blockComments.qml callContextPropertyLookupResult.qml childobject.qml colorAsVariant.qml diff --git a/tests/auto/qml/qmlcppcodegen/data/blockComments.qml b/tests/auto/qml/qmlcppcodegen/data/blockComments.qml new file mode 100644 index 0000000000..da4bb2fd25 --- /dev/null +++ b/tests/auto/qml/qmlcppcodegen/data/blockComments.qml @@ -0,0 +1,10 @@ +pragma Strict +import QtQml + +QtObject { + property real implicitHeight: { + return /*+ (control.implicitHeaderHeight > 0 + ? control.implicitHeaderHeight + control.spacing + : 0)*/ 8; + } +} |