diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2020-12-09 09:18:02 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-12-11 16:48:19 +0000 |
| commit | ca992488c057b40e0774a18965f75f9277daa5cc (patch) | |
| tree | 7cdb4392bd709c020dd4caab59d4b75745d9129f /share | |
| parent | 428ac96dd1e4281a01b368c9adff21a05d43a200 (diff) | |
Fix use of translations in Qt wizards for Qt 6
qt_create_translation was introduced in Qt 5.15. But we also still
support older Qt versions, so we cannot use it unconditionally.
Fixes: QTCREATORBUG-25070
Change-Id: I81de7e19b42e0e8cb9cb23e14909e71c534dc0da
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
4 files changed, 26 insertions, 10 deletions
diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt index 6e134b6489..b0de6b947c 100644 --- a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt @@ -30,5 +30,9 @@ add_executable(%{ProjectName} target_link_libraries(%{ProjectName} Qt${QT_VERSION_MAJOR}::Core) @if %{HasTranslation} -qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +if(COMMAND qt_create_translation) + qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +else() + qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +endif() @endif diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt index 612f429777..f84cf90b29 100644 --- a/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt @@ -46,5 +46,9 @@ target_compile_definitions(%{ProjectName} PRIVATE %{LibraryDefine}) @endif @if %{HasTranslation} -qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +if(COMMAND qt_create_translation) + qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +else() + qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +endif() @endif diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt index 34f57b36b8..c77aacfcf2 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt @@ -46,6 +46,10 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) qt_add_executable(%{ProjectName} ${PROJECT_SOURCES} ) +@if %{HasTranslation} + + qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +@endif else() if(ANDROID) add_library(%{ProjectName} SHARED @@ -56,13 +60,13 @@ else() ${PROJECT_SOURCES} ) endif() +@if %{HasTranslation} + + qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +@endif endif() target_compile_definitions(%{ProjectName} PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>) target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick) -@if %{HasTranslation} - -qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) -@endif diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt index bd01628517..9f247d5522 100644 --- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt @@ -50,6 +50,10 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) qt_add_executable(%{ProjectName} ${PROJECT_SOURCES} ) +@if %{HasTranslation} + + qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) +@endif else() if(ANDROID) add_library(%{ProjectName} SHARED @@ -60,10 +64,10 @@ else() ${PROJECT_SOURCES} ) endif() -endif() - -target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) @if %{HasTranslation} -qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) + qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) @endif +endif() + +target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) |