diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-28 15:48:36 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-28 15:48:36 +0200 |
| commit | e9661e43cbbb934e1aca7941685e2035c7dbde56 (patch) | |
| tree | 438839660dff750585b4182bcb3711bf98e2e8a9 /src/tools | |
| parent | 6efed7140b37616b6a6882dd9096d1edafedd089 (diff) | |
| parent | 05f746cfd029c0232bb5880c50d0b0d7d17f0cc5 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clangbackend/source/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/tools/clangpchmanagerbackend/source/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/tools/clangrefactoringbackend/source/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/clangbackend/source/CMakeLists.txt b/src/tools/clangbackend/source/CMakeLists.txt index fe0ab54deb6..b071cb46b72 100644 --- a/src/tools/clangbackend/source/CMakeLists.txt +++ b/src/tools/clangbackend/source/CMakeLists.txt @@ -3,6 +3,7 @@ add_qtc_library(clangbackend_lib STATIC PUBLIC_DEFINES CLANGSUPPORT_BUILD_LIB PUBLIC_INCLUDES ${CLANG_INCLUDE_DIRS} + "${CMAKE_CURRENT_LIST_DIR}" SOURCES clangasyncjob.h clangbackend_global.h diff --git a/src/tools/clangpchmanagerbackend/source/CMakeLists.txt b/src/tools/clangpchmanagerbackend/source/CMakeLists.txt index 76973c6a21d..fd6644da235 100644 --- a/src/tools/clangpchmanagerbackend/source/CMakeLists.txt +++ b/src/tools/clangpchmanagerbackend/source/CMakeLists.txt @@ -3,6 +3,7 @@ add_qtc_library(clangpchmanagerbackend_lib STATIC PUBLIC_DEPENDS libclang PUBLIC_DEFINES CLANGSUPPORT_BUILD_LIB PUBLIC_INCLUDES + ../../clangrefactoringbackend/source ${CLANG_INCLUDE_DIRS} SOURCES builddependenciesprovider.cpp builddependenciesprovider.h diff --git a/src/tools/clangrefactoringbackend/source/CMakeLists.txt b/src/tools/clangrefactoringbackend/source/CMakeLists.txt index 420e630c886..f06ddee1cc6 100644 --- a/src/tools/clangrefactoringbackend/source/CMakeLists.txt +++ b/src/tools/clangrefactoringbackend/source/CMakeLists.txt @@ -10,6 +10,7 @@ add_qtc_library(clangrefactoringbackend_lib STATIC PUBLIC_INCLUDES ${CLANG_INCLUDE_DIRS} "../../clangpchmanagerbackend/source" + "${CMAKE_CURRENT_LIST_DIR}" SOURCES clangquery.cpp clangquery.h clangquerygatherer.cpp clangquerygatherer.h |