diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-31 13:56:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-31 13:48:09 +0000 |
| commit | 92fdc6b2ea76aef39d33f068d50aa341967cbaec (patch) | |
| tree | eade5c6162c9f9d70a2e98b1eb5049200d62e1aa | |
| parent | 045bb3df921ead5719d946eef4809f9f8d52d35e (diff) | |
cmake: Fix setting QT_DISABLE_DEPRECATED_BEFORE
The last set would override the variable instead of appending to it,
thus QT_DISABLE_DEPRECATED_BEFORE was never set.
Change-Id: I173b91704a855fcda1f2b86172d318e3953466db
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index ade0c05328..c47271f9de 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1142,12 +1142,13 @@ function(qt_internal_library_deprecation_level result) if(WIN32) # On Windows, due to the way DLLs work, we need to export all functions, # including the inlines - set("${result}" "QT_DISABLE_DEPRECATED_BEFORE=0x040800" PARENT_SCOPE) + list(APPEND deprecations "QT_DISABLE_DEPRECATED_BEFORE=0x040800") else() # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API - set("${result}" "QT_DISABLE_DEPRECATED_BEFORE=0x050000" PARENT_SCOPE) + list(APPEND deprecations "QT_DISABLE_DEPRECATED_BEFORE=0x050000") endif() - set("${result}" "QT_DEPRECATED_WARNINGS_SINCE=0x060000" PARENT_SCOPE) + list(APPEND deprecations "QT_DEPRECATED_WARNINGS_SINCE=0x060000") + set("${result}" deprecations PARENT_SCOPE) endfunction() |