diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-07-14 12:20:35 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-07-14 12:20:35 +0200 |
| commit | f08bd9df91dfb08504babee4c9968167182f64ba (patch) | |
| tree | a461c7b364c57b72f54a2197aa1d079589f43047 /cmake | |
| parent | d8286adc7c71c354f22b98e2d69568638bcb49e7 (diff) | |
| parent | 40e87880fd81ce91dfdde0e5169eeb3795eea619 (diff) | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: Iba1e6cacaebf9bb4653ac77e981ddacaf729c52c
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindQt5.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtCreatorTranslations.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/FindQt5.cmake b/cmake/FindQt5.cmake index dbbb07681f..4fde452733 100644 --- a/cmake/FindQt5.cmake +++ b/cmake/FindQt5.cmake @@ -78,7 +78,7 @@ endif() set(Qt5_FOUND ${Qt6_FOUND}) set(Qt5_VERSION ${Qt6_VERSION}) -foreach(tool qmake lrelease moc rcc qhelpgenerator) +foreach(tool qmake lrelease lupdate moc rcc qhelpgenerator) if (TARGET Qt6::${tool} AND NOT TARGET Qt5::${tool}) add_executable(Qt5::${tool} IMPORTED GLOBAL) get_target_property(imported_location Qt6::${tool} IMPORTED_LOCATION) diff --git a/cmake/QtCreatorTranslations.cmake b/cmake/QtCreatorTranslations.cmake index a674f37be6..a9da1e5247 100644 --- a/cmake/QtCreatorTranslations.cmake +++ b/cmake/QtCreatorTranslations.cmake @@ -95,7 +95,7 @@ function(_create_ts_custom_target name) endfunction() function(add_translation_targets file_prefix) - if (NOT TARGET Qt5::lrelease) + if (NOT TARGET Qt5::lrelease OR NOT TARGET Qt5::lupdate) # No Qt translation tools were found: Skip this directory message(WARNING "No Qt translation tools found, skipping translation targets. Add find_package(Qt5 COMPONENTS LinguistTools) to CMake to enable.") return() |