summarylogtreecommitdiffstats
path: root/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
diff options
context:
space:
mode:
authorMartchus2019-06-26 14:41:33 +0200
committerMartchus2019-06-26 14:41:33 +0200
commit7e9790ef70cdbf8552595445b938883ba09b475b (patch)
tree54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0026-Fix-macro-invoking-moc-rcc-and-uic.patch
parent748a3f030424dc491a60d5166204dee722f9cbb6 (diff)
downloadaur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz
Update to 5.13.0
Diffstat (limited to '0026-Fix-macro-invoking-moc-rcc-and-uic.patch')
-rw-r--r--0026-Fix-macro-invoking-moc-rcc-and-uic.patch74
1 files changed, 0 insertions, 74 deletions
diff --git a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
deleted file mode 100644
index 216c33d3c65..00000000000
--- a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 52682db5b750289cdd3dc68682861da8507db2b3 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 26/34] 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 620795d2cf..1e80a47980 100644
---- a/src/corelib/Qt5CoreMacros.cmake
-+++ b/src/corelib/Qt5CoreMacros.cmake
-@@ -132,8 +132,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)
-@@ -248,8 +249,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})
-@@ -281,8 +283,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 737371a5ad..d103278cdf 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.21.0
-