diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-03 03:01:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-03 03:01:15 +0200 |
| commit | 25fae19bbfdc3d296e4a36a1dfdbf95e9bb6886f (patch) | |
| tree | f153c2f206ad1cb797c382e63a99bd5beb061d05 /tests | |
| parent | 0779a2ee5db5eb009e027ba08628e2172b2e7632 (diff) | |
| parent | f1c59c4e73236f8a93489776f3746d72dde94cc4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I88c539e807e21613fad838dc5230ab26994ed749
Diffstat (limited to 'tests')
3 files changed, 13 insertions, 1 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/lupdatecmd index 7996a444a..e2f91b5f1 100644 --- a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/lupdatecmd +++ b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/lupdatecmd @@ -1 +1 @@ -lupdate main.cpp -tr-function-alias QT_TRANSLATE_NOOP+=QT_TRANSLATE_NOOP_ALIAS,QT_TRANSLATE_NOOP_UTF8+=QT_TRANSLATE_NOOP_UTF8_ALIAS,QT_TRANSLATE_NOOP3+=QT_TRANSLATE_NOOP3_ALIAS,QT_TRANSLATE_NOOP3_UTF8+=QT_TRANSLATE_NOOP3_UTF8_ALIAS,QT_TRID_NOOP+=QT_TRID_NOOP_ALIAS,Q_DECLARE_TR_FUNCTIONS+=Q_DECLARE_TR_FUNCTIONS_ALIAS,qtTrId+=qtTrId_alias,QT_TR_NOOP+=QT_TR_NOOP_ALIAS,QT_TR_NOOP_UTF8+=QT_TR_NOOP_UTF8_ALIAS,tr+=tr_alias,trUtf8+=trUtf8_alias,translate+=translate_alias -ts project.ts +lupdate main.cpp main.qml -tr-function-alias QT_TRANSLATE_NOOP+=QT_TRANSLATE_NOOP_ALIAS,QT_TRANSLATE_NOOP_UTF8+=QT_TRANSLATE_NOOP_UTF8_ALIAS,QT_TRANSLATE_NOOP3+=QT_TRANSLATE_NOOP3_ALIAS,QT_TRANSLATE_NOOP3_UTF8+=QT_TRANSLATE_NOOP3_UTF8_ALIAS,QT_TRID_NOOP+=QT_TRID_NOOP_ALIAS,Q_DECLARE_TR_FUNCTIONS+=Q_DECLARE_TR_FUNCTIONS_ALIAS,qtTrId+=qtTrId_alias,QT_TR_NOOP+=QT_TR_NOOP_ALIAS,QT_TR_NOOP_UTF8+=QT_TR_NOOP_UTF8_ALIAS,tr+=tr_alias,trUtf8+=trUtf8_alias,translate+=translate_alias,qsTr=MySingletonCustomTranslator.subObject.tr -ts project.ts diff --git a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.qml b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.qml new file mode 100644 index 000000000..3fd65ce9f --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.qml @@ -0,0 +1,4 @@ +import MyModuleWithSingleton 1.0 +Text { + text: MySingletonCustomTranslator.subObject.tr("xxx") +} diff --git a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/project.ts.result index 93e5b9781..974c4523b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/project.ts.result @@ -130,6 +130,14 @@ </message> </context> <context> + <name>main</name> + <message> + <location filename="main.qml" line="3"/> + <source>xxx</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>scope</name> <message> <location filename="main.cpp" line="34"/> |