summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-03-22 10:31:04 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-03-22 14:40:38 +0000
commit5fd30d0a189a956e83e66f19beed61efae757e54 (patch)
tree445b24560075c16b8fc1f16f6542ae6b5897728e
parent8158a8767c4c0ece37c55c2cc6777267221693ee (diff)
Revert "Fix wrong target in qt_feature_module_begin"
It broke builds because the qconfig.h file was created in the wrong directory. This reverts commit 25f67fbb073c8bedf26e165f52abacf3e20a6a94. Change-Id: Ia458ef4193a3985a9ba613d82f679b7df5ca0107 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--cmake/QtBaseGlobalTargets.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
index 5ede1c7b59..73deb51b49 100644
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -39,7 +39,7 @@ target_include_directories(GlobalConfig INTERFACE
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include/QtCore>
)
-qt_feature_module_begin(LIBRARY GlobalConfig
+qt_feature_module_begin(LIBRARY Core
PUBLIC_FILE src/corelib/global/qconfig.h
PRIVATE_FILE src/corelib/global/qconfig_p.h
)