diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-18 18:35:50 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-19 19:10:41 +0100 |
| commit | 8b7894cb637d21d8fa9bd129849cd23462632d28 (patch) | |
| tree | 976987fec3b7df746b144760f398bb355196a4ae | |
| parent | 2ce94889a192ea67ba343bf0f6b16ede2648f374 (diff) | |
Move UNICODE and _UNICODE definitions to internal platform target
Move UNICODE and _UNICODE definitions from the public Qt::Platform
target to the private Qt::PlatformCommonInternal target.
Fixes: QTBUG-89951
Change-Id: Ib4c1c4cab74acda0a43c4ddb3cffd3954393dc89
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | cmake/QtBuild.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtInternalTargets.cmake | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 5af6c0527f..cc15d9155c 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -276,7 +276,7 @@ qt_setup_tool_path_command() # Platform define path, etc. if(WIN32) - set(QT_DEFAULT_PLATFORM_DEFINITIONS UNICODE _UNICODE WIN32 _ENABLE_EXTENDED_ALIGNED_STORAGE) + set(QT_DEFAULT_PLATFORM_DEFINITIONS WIN32 _ENABLE_EXTENDED_ALIGNED_STORAGE) if(CMAKE_SIZEOF_VOID_P EQUAL 8) list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64) endif() diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake index ee6c0280ff..4ed2f1c21a 100644 --- a/cmake/QtInternalTargets.cmake +++ b/cmake/QtInternalTargets.cmake @@ -147,6 +147,10 @@ elseif(UIKIT) target_compile_definitions(PlatformCommonInternal INTERFACE GLES_SILENCE_DEPRECATION) endif() +if(WIN32) + target_compile_definitions(PlatformCommonInternal INTERFACE "UNICODE;_UNICODE") +endif() + if(UIKIT) # Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for # simulator_and_device_builds. |