From 48432161926332a15efa3479c6cad73d825aaddb Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 28 Oct 2019 16:06:00 +0100 Subject: macOS: Fix execution of helper executables with UI The qt.conf that is written into the Resources/ folder is used for the main Qt Creator executable, so that cannot be used for the helper executables. Move the executables one more level down and add a separate qt.conf for them. Fixes: QTCREATORBUG-23120 Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda Reviewed-by: Christian Kandeler Reviewed-by: Christian Stenger --- cmake/QtCreatorAPI.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 300b7cd50a..f32a8b24d5 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -31,7 +31,7 @@ if (APPLE) set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns") set(_IDE_LIBRARY_BASE_PATH "Frameworks") set(_IDE_LIBRARY_PATH "${_IDE_OUTPUT_PATH}/Frameworks") - set(_IDE_LIBEXEC_PATH "${_IDE_OUTPUT_PATH}/Resources") + set(_IDE_LIBEXEC_PATH "${_IDE_OUTPUT_PATH}/Resources/libexec") set(_IDE_DATA_PATH "${_IDE_OUTPUT_PATH}/Resources") set(_IDE_DOC_PATH "${_IDE_OUTPUT_PATH}/Resources/doc") set(_IDE_BIN_PATH "${_IDE_OUTPUT_PATH}/MacOS") -- cgit v1.2.1 From eebf36adc776fde43acf69c1ff71bcf35836dbfd Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 7 Nov 2019 14:56:15 +0100 Subject: CMake: Make sure that explicit plugin.h files depend on the json file ClangCodeModel plugin was not updating its version number because of the EXPLICIT_MOC call. Change-Id: I109d80c93d8af628c8981d49c93dcb0ebe21f1ee Reviewed-by: Eike Ziller --- cmake/QtCreatorAPI.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index f32a8b24d5..41c9867bef 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -171,8 +171,12 @@ function(separate_object_libraries libraries REGULAR_LIBS OBJECT_LIBS OBJECT_LIB endfunction(separate_object_libraries) function(set_explicit_moc target_name file) + unset(file_dependencies) + if (file MATCHES "^.*plugin.h$") + set(file_dependencies DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.json") + endif() set_property(SOURCE "${file}" PROPERTY SKIP_AUTOMOC ON) - qt5_wrap_cpp(file_moc "${file}") + qt5_wrap_cpp(file_moc "${file}" ${file_dependencies}) target_sources(${target_name} PRIVATE "${file_moc}") endfunction() -- cgit v1.2.1