diff options
author | Eike Ziller <eike.ziller@qt.io> | 2021-08-11 10:10:51 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-11 10:10:51 +0200 |
commit | c7168d1063ecb8a409e0fbbab911dead63604626 (patch) | |
tree | 923afe7eaf77a21f21104bb24605e002d58a8bfd /cmake | |
parent | 7be290ec592fa2375ca289731c01490ae1f7f85c (diff) | |
parent | 21cb0711c4d9bbd9d5d4b32899bf037dc8f1f4db (diff) |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
src/plugins/coreplugin/locator/executefilter.cpp
Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/QtCreatorAPI.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index fafa5180e7..ac97e74fc4 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -269,6 +269,7 @@ function(add_qtc_library name) PREFIX "" IMPORT_SUFFIX "${IDE_VERSION_MAJOR}${CMAKE_IMPORT_LIBRARY_SUFFIX}" IMPORT_PREFIX "" + PDB_NAME "${name}${IDE_VERSION_MAJOR}${.pdb}" ) endif() @@ -525,6 +526,7 @@ function(add_qtc_plugin target_name) PREFIX "" IMPORT_SUFFIX "${IDE_VERSION_MAJOR}${CMAKE_IMPORT_LIBRARY_SUFFIX}" IMPORT_PREFIX "" + PDB_NAME "${name}${IDE_VERSION_MAJOR}${.pdb}" ) endif() if (NOT _arg_SKIP_PCH) |