diff options
author | Semih Yavuz <semih.yavuz@qt.io> | 2022-09-20 13:30:31 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-09-28 21:46:24 +0000 |
commit | 8ebdbf5c85e2c99118a5d2c6e457c14a6455e44b (patch) | |
tree | 67f1292aaceab52df21d47370411dbda298e8cd3 /src/qml/qml/qqmlbuiltinfunctions.cpp | |
parent | a370bcf900c6d8337a01a37fc36ee6a140287dbf (diff) |
Avoid context truncation when filename has multiple dots
Use completeBaseName() as in lupdate while computing context. This
change causes regression as one of the test case relies on truncation of
the context. In order to prevent this from failing, introduce the file that test
case needs as input. Also, add a test case for not truncating multiple
dotted input file.
[ChangeLog][QtQml] The translation context in QML files has been changed
to be in line with lupdate: Instead of using only the baseName(),
completeBaseName() is now used.
Fixes: QTBUG-106705
Change-Id: Iae52657f28429109b4f32655cc95f444de72b0ba
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlbuiltinfunctions.cpp')
-rw-r--r-- | src/qml/qml/qqmlbuiltinfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlbuiltinfunctions.cpp b/src/qml/qml/qqmlbuiltinfunctions.cpp index d244dae6ad..b8c65a5d15 100644 --- a/src/qml/qml/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/qqmlbuiltinfunctions.cpp @@ -1950,7 +1950,7 @@ QString GlobalExtensions::currentTranslationContext(ExecutionEngine *engine) if (context.isEmpty() && fileName.startsWith(QLatin1String(":/"))) context = fileName; } - context = QFileInfo(context).baseName(); + context = QFileInfo(context).completeBaseName(); } frame = frame->parentFrame(); } |