diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-05 13:52:33 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 11:49:44 +0000 |
| commit | f53ca8a4fc1e82d1c4802e387abe759b53f74b62 (patch) | |
| tree | cf23ff3170fd753b46e39f2a5e497353da7bc1a9 /src/widgets/Qt6WidgetsMacros.cmake | |
| parent | b10d8eab047c387409716ae87422d2efffee3159 (diff) | |
CMake: Add Qt 5 backward compatible CMake API
Create versionless function names, that coincide with the Qt 5 CMake
API.
Task-number: QTBUG-74137
Task-number: QTBUG-80477
Change-Id: I8559b2c8a49b23e5a89ec81603aaec54ea634d70
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/widgets/Qt6WidgetsMacros.cmake')
| -rw-r--r-- | src/widgets/Qt6WidgetsMacros.cmake | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake index f996b66519..5b0f2e700f 100644 --- a/src/widgets/Qt6WidgetsMacros.cmake +++ b/src/widgets/Qt6WidgetsMacros.cmake @@ -39,9 +39,9 @@ include(CMakeParseArguments) -# qt5_wrap_ui(outfiles inputfile ... ) +# qt6_wrap_ui(outfiles inputfile ... ) -function(qt5_wrap_ui outfiles ) +function(qt6_wrap_ui outfiles ) set(options) set(oneValueArgs) set(multiValueArgs OPTIONS) @@ -66,3 +66,15 @@ function(qt5_wrap_ui outfiles ) endforeach() set(${outfiles} ${${outfiles}} PARENT_SCOPE) endfunction() + +# This will override the CMake upstream command, because that one is for Qt 3. +if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) + function(qt_wrap_ui outfiles) + if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) + qt5_wrap_ui("${outfiles}" ${ARGN}) + elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) + qt6_wrap_ui("${outfiles}" ${ARGN}) + endif() + set("${outfiles}" "${${outfiles}}" PARENT_SCOPE) + endfunction() +endif() |