diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /src/widgets | |
parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/.prev_CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/widgets/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/widgets/Qt6WidgetsMacros.cmake | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index e8b01ff99c..db39f84104 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -60,6 +60,9 @@ qt_add_module(Widgets PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate PRECOMPILED_HEADER "kernel/qt_widgets_pch.h" ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index a7ba83bde8..e756b27bee 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -60,6 +60,9 @@ qt_add_module(Widgets PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate PRECOMPILED_HEADER "kernel/qt_widgets_pch.h" ) diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake index 5b0f2e700f..aa8133ba47 100644 --- a/src/widgets/Qt6WidgetsMacros.cmake +++ b/src/widgets/Qt6WidgetsMacros.cmake @@ -56,6 +56,7 @@ function(qt6_wrap_ui outfiles ) get_filename_component(infile ${it} ABSOLUTE) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) add_custom_command(OUTPUT ${outfile} + DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::uic COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::uic ARGS ${ui_options} -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile} VERBATIM) |