* Update patch for static freetype2 in qt5 for brotli library renaming * Update patches for Qt 5 SQL drivers to include crypt32 * This library is required by OpenSSL's crypto library. Not sure why there were no linker errors before.
75 lines
3.6 KiB
Diff
75 lines
3.6 KiB
Diff
From c78641f7d7f6fc5878153d219e83dbf27d8a07b4 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 4 Dec 2016 20:35:47 +0100
|
|
Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
|
|
|
|
* Otherwise the arguments aren't passed correctly leading to errors like
|
|
```
|
|
[ 3%] Generating qca_core.moc
|
|
moc: Too many input files specified: 'Qt5::moc' '/build/qca-qt5/src/qca-2.1.3/include/QtCrypto/qca_safetimer.h'
|
|
```
|
|
* Just a workaround, not sure what is causing the issue (maybe a CMake bug?)
|
|
* See https://github.com/Martchus/PKGBUILDs/issues/11
|
|
|
|
Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
|
|
---
|
|
src/corelib/Qt5CoreMacros.cmake | 9 ++++++---
|
|
src/widgets/Qt5WidgetsMacros.cmake | 3 ++-
|
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
|
|
index d91873f1bc..8f1fb17722 100644
|
|
--- a/src/corelib/Qt5CoreMacros.cmake
|
|
+++ b/src/corelib/Qt5CoreMacros.cmake
|
|
@@ -153,8 +153,9 @@ function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target
|
|
endif()
|
|
|
|
set(_moc_extra_parameters_file @${_moc_parameters_file})
|
|
+ get_target_property(MOC_LOC ${Qt5Core_MOC_EXECUTABLE} IMPORTED_LOCATION)
|
|
add_custom_command(OUTPUT ${outfile}
|
|
- COMMAND ${Qt5Core_MOC_EXECUTABLE} ${_moc_extra_parameters_file}
|
|
+ COMMAND ${MOC_LOC} ${_moc_extra_parameters_file}
|
|
DEPENDS ${infile} ${moc_depends}
|
|
${_moc_working_dir}
|
|
VERBATIM)
|
|
@@ -295,8 +296,9 @@ function(qt5_add_binary_resources target)
|
|
set(rc_depends ${rc_depends} ${_rc_depends})
|
|
endforeach()
|
|
|
|
+ get_target_property(RCC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
|
|
add_custom_command(OUTPUT ${rcc_destination}
|
|
- COMMAND ${Qt5Core_RCC_EXECUTABLE}
|
|
+ COMMAND ${RCC_LOC}
|
|
ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
|
|
DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
|
|
add_custom_target(${target} ALL DEPENDS ${rcc_destination})
|
|
@@ -339,8 +341,9 @@ function(qt5_add_resources outfiles)
|
|
_qt5_parse_qrc_file(${infile} _out_depends _rc_depends)
|
|
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
|
|
|
|
+ get_target_property(MOC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
|
|
add_custom_command(OUTPUT ${outfile}
|
|
- COMMAND ${Qt5Core_RCC_EXECUTABLE}
|
|
+ COMMAND ${MOC_LOC}
|
|
ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile}
|
|
MAIN_DEPENDENCY ${infile}
|
|
DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM)
|
|
diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake
|
|
index 35d2a2dc54..99f061f1b8 100644
|
|
--- a/src/widgets/Qt5WidgetsMacros.cmake
|
|
+++ b/src/widgets/Qt5WidgetsMacros.cmake
|
|
@@ -55,8 +55,9 @@ function(qt5_wrap_ui outfiles )
|
|
get_filename_component(outfile ${it} NAME_WE)
|
|
get_filename_component(infile ${it} ABSOLUTE)
|
|
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
|
|
+ get_target_property(UIC_LOC ${Qt5Widgets_UIC_EXECUTABLE} IMPORTED_LOCATION)
|
|
add_custom_command(OUTPUT ${outfile}
|
|
- COMMAND ${Qt5Widgets_UIC_EXECUTABLE}
|
|
+ COMMAND ${UIC_LOC}
|
|
ARGS ${ui_options} -o ${outfile} ${infile}
|
|
MAIN_DEPENDENCY ${infile} VERBATIM)
|
|
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
|
|
--
|
|
2.43.0
|
|
|