summarylogtreecommitdiffstats
path: root/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
diff options
context:
space:
mode:
authorMartchus2018-05-28 21:50:43 +0200
committerMartchus2018-05-28 21:50:43 +0200
commit1de5b17c1169b308c3a014303dc8217228b90cca (patch)
treed2cdeb79f6dc53b2c55cbfbc84e191ca59508b7b /0026-Fix-macro-invoking-moc-rcc-and-uic.patch
parent5522f822fc1124b7feaa9b9ed1e958a5f8897a9c (diff)
downloadaur-1de5b17c1169b308c3a014303dc8217228b90cca.tar.gz
Update to 5.11.0
Diffstat (limited to '0026-Fix-macro-invoking-moc-rcc-and-uic.patch')
-rw-r--r--0026-Fix-macro-invoking-moc-rcc-and-uic.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
index eedb6ba5282..23e7c6f99f3 100644
--- a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From 14e1e2026e3e5bc255c717ecde076f54e0e107b1 Mon Sep 17 00:00:00 2001
+From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 26/32] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
* Otherwise the arguments aren't passed correctly leading to errors like
```
@@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 8d3dbe3ecf..f0f0d69309 100644
+index 1627de4002..ed0f6555a7 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
@@ -32,7 +32,7 @@ index 8d3dbe3ecf..f0f0d69309 100644
DEPENDS ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
-@@ -254,8 +255,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
+@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
set(rc_depends ${rc_depends} ${_rc_depends})
endforeach()
@@ -43,7 +43,7 @@ index 8d3dbe3ecf..f0f0d69309 100644
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})
-@@ -287,8 +289,9 @@ function(QT5_ADD_RESOURCES outfiles )
+@@ -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)
@@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
-2.16.1
+2.17.0