diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 15:29:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-14 14:27:24 +0000 |
| commit | 72066a3a585b4f4fed499c64464ca5ad2ba9f71d (patch) | |
| tree | 5c38796a008bf67a58e5d86d8a7bd5ca4b1d32d2 /qmake | |
| parent | 7559d508d1993dd90a4939441eaf353d55462ae5 (diff) | |
Revert "cmake: Make CMake superbuilds work"
Builds fail on Windows, due to splitting on ':' on absolute file paths,
when handling syncqt injections.
Revert for now to get qt6 merge in faster.
This reverts commit 7559d508d1993dd90a4939441eaf353d55462ae5.
Change-Id: If139a8a1eb4ae7ccc8d7b835b12e83b03176e28b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 22fbda307b..6f8763524f 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -124,7 +124,7 @@ add_qt_tool(qmake # special case generators/win32 library $<TARGET_PROPERTY:Qt::CorePrivate,INTERFACE_INCLUDE_DIRECTORIES> # special case - ${CMAKE_CURRENT_BINARY_DIR}/../src/corelib/global # special case: for qconfig.cpp + ${CMAKE_BINARY_DIR}/src/corelib/global # special case: for qconfig.cpp ) qt_internal_add_target_aliases(Bootstrap) # special case |