diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-02 13:15:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-02 13:15:15 +0200 |
| commit | 7de400052f7df52095103f56f1cb753854be1af1 (patch) | |
| tree | 823c01302efd5d2181a3b3a55eb2937e52c849b1 /mkspecs | |
| parent | 8b098e6544221a96bc6a41a6bfcc0dfa7cf805e6 (diff) | |
| parent | 364bd6ca74b059ffe8ae367e1562645a3ed0855e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia082e20e2eb4b76afd4c1a1584ff4e5514655d7a
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 66acedef55..2ed708e085 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -28,9 +28,13 @@ CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE}) +!generated_privates { + isEmpty(SYNCQT.INJECTED_PRIVATE_HEADER_FILES):isEmpty(SYNCQT.PRIVATE_HEADER_FILES): \ + CMAKE_NO_PRIVATE_INCLUDES = true +} + split_incpath { CMAKE_ADD_SOURCE_INCLUDE_DIRS = true - CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build dir which don't exist CMAKE_SOURCE_INCLUDES = \ $$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}) CMAKE_SOURCE_PRIVATE_INCLUDES = \ @@ -53,10 +57,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True } -isEmpty(QT.$${MODULE}_private.includes)| \ - !exists($$first(QT.$${MODULE}_private.includes)): \ - CMAKE_NO_PRIVATE_INCLUDES = true - CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) contains(CMAKE_LIB_DIR,"^\\.\\./.*") { CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ |