diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindQt5.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtCreatorIDEBranding.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/FindQt5.cmake b/cmake/FindQt5.cmake index 762ec8810c8..304c3fc07d3 100644 --- a/cmake/FindQt5.cmake +++ b/cmake/FindQt5.cmake @@ -52,7 +52,7 @@ endforeach() set(Qt5_FOUND ${Qt6_FOUND}) -foreach(tool qmake lrelease) +foreach(tool qmake lrelease moc) if (TARGET Qt6::${tool} AND NOT TARGET Qt5::${tool}) add_executable(Qt5::${tool} IMPORTED GLOBAL) get_target_property(imported_location Qt6::${tool} IMPORTED_LOCATION_RELEASE) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 1e10d7f0016..05f4a3fc77e 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,9 +1,9 @@ #BINARY_ARTIFACTS_BRANCH = master #PROJECT_USER_FILE_EXTENSION = .user -set(IDE_VERSION "4.12.1") # The IDE version. -set(IDE_VERSION_COMPAT "4.12.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.12.1") # The IDE display version. +set(IDE_VERSION "4.12.82") # The IDE version. +set(IDE_VERSION_COMPAT "4.12.82") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "4.13.0-beta1") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2020") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. |