summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/QtBuild.cmake1
-rw-r--r--src/corelib/CMakeLists.txt2
-rw-r--r--src/tools/uic/CMakeLists.txt2
3 files changed, 5 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index dd9d5b1693..bc07da27ba 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -321,6 +321,7 @@ function(qt_autogen_tools target)
PROPERTIES
AUTO${captitalAutogenTool} ON
AUTO${captitalAutogenTool}_EXECUTABLE "$<TARGET_FILE:Qt::${autogen_tool}>")
+ set_property(TARGET ${target} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS Qt::${autogen_tool})
endforeach()
set_directory_properties(PROPERTIES
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 3484e2b15e..e1d827d0ee 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -242,6 +242,8 @@ add_qt_module(Core
ZLIB::ZLIB
PUBLIC_LIBRARIES # special case:
Qt::Platform
+ DISABLE_AUTOGEN_TOOLS # special case:
+ uic
# ANDROID_BUNDLED_JAR_DEPENDENCIES = "jar/QtAndroid.jar"
# ANDROID_LIB_DEPENDENCIES = "plugins/platforms/android/libqtforandroid.so"
# ANDROID_PERMISSIONS = "android.permission.INTERNET" "android.permission.WRITE_EXTERNAL_STORAGE"
diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index 46826b7d52..15ef92a2b4 100644
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -27,6 +27,8 @@ add_qt_tool(uic
QT_UIC_CPP_GENERATOR
INCLUDE_DIRECTORIES
cpp
+ DISABLE_AUTOGEN_TOOLS # special case:
+ uic rcc
# QMAKE_TARGET_DESCRIPTION = "Qt User Interface Compiler"
# _LOADED = "qt_tool"
# _OPTION = "host_build"