diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-27 12:11:15 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 12:11:15 +0200 |
commit | ef4e761c7519449ff9bb0d0b14bd50c03228a39e (patch) | |
tree | 38a7bd19b15517030412f436a9e596be86b7a0b7 /tests | |
parent | 3947d229cb8ed8dde5ab72708a4a149ac6d83cae (diff) | |
parent | ae4823946c7ab4037d4bde8d4d0e43c046fea4cf (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I73fad6fed560b8df8382cb9c17fe295a74ef3553
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp | 8 | ||||
-rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp index 3f3a99c48..1bc1dc2a2 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp @@ -647,3 +647,11 @@ QObject::tr("message after system include without space"); #include"qobject.h" QObject::tr("message after local include without space"); + + + +// QTBUG-35164: handling of \uNNNN escapes +QString unicodeEscape() +{ + return QApplication::tr("Context", "soft\u00ADhyphen"); +} diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result index 683c2aef3..c344667cf 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result @@ -295,6 +295,12 @@ backslashed \ stuff.</source> <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> <translation type="unfinished"></translation> </message> + <message> + <location filename="main.cpp" line="656"/> + <source>Context</source> + <comment>softhyphen</comment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QCoreApplication</name> |